Merge pull request #6923 from astrofrog/nose-optional

tacaswell · tacaswell · commit 48dedc481631 · 2016-08-13T16:23:43.000-04:00
MNT: Make sure nose is only imported when needed
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -12,7 +12,10 @@
 import warnings
 import unittest
 
-import nose
+# Note - don't import nose up here - import it only as needed in functions. This
+# allows other functions here to be used by pytest-based testing suites without
+# requiring nose to be installed.
+
 import numpy as np
 
 import matplotlib as mpl
@@ -412,6 +415,9 @@ def find_dotted_module(module_name, path=None):
 
 
 def switch_backend(backend):
+    # Local import to avoid a hard nose dependency and only incur the
+    # import time overhead at actual test-time.
+    import nose
     def switch_backend_decorator(func):
         def backend_switcher(*args, **kwargs):
             try:
