matplotlib · anntzer · Jan 27, 2017 · Jan 25, 2017 · Jan 25, 2017 · Jan 25, 2017
diff --git a/doc/api/api_changes/deprecations.rst b/doc/api/api_changes/deprecations.rst
@@ -0,0 +1,4 @@
+Deprecations
+````````````
+
+- `matplotlib.testing.noseclasses` is deprecated and will be removed in 2.3
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1511,15 +1511,15 @@ def _init_tests():
             )
         )
 
-    from .testing.nose import check_deps
+    from .testing._nose import check_deps
     check_deps()
 
 
 def test(verbosity=1, coverage=False, **kwargs):
     """run the matplotlib test suite"""
     _init_tests()
 
-    from .testing.nose import test as nose_test
+    from .testing._nose import test as nose_test
     return nose_test(verbosity, coverage, **kwargs)
 
 

diff --git a/lib/matplotlib/testing/nose/__init__.py → lib/matplotlib/testing/_nose/__init__.py b/lib/matplotlib/testing/nose/__init__.py → lib/matplotlib/testing/_nose/__init__.py
diff --git a/lib/matplotlib/testing/nose/decorators.py → lib/matplotlib/testing/_nose/decorators.py b/lib/matplotlib/testing/nose/decorators.py → lib/matplotlib/testing/_nose/decorators.py
diff --git a/lib/matplotlib/testing/nose/exceptions.py → lib/matplotlib/testing/_nose/exceptions.py b/lib/matplotlib/testing/nose/exceptions.py → lib/matplotlib/testing/_nose/exceptions.py
diff --git a/...tplotlib/testing/nose/plugins/__init__.py → ...plotlib/testing/_nose/plugins/__init__.py b/...tplotlib/testing/nose/plugins/__init__.py → ...plotlib/testing/_nose/plugins/__init__.py
diff --git a/...tlib/testing/nose/plugins/knownfailure.py → ...lib/testing/_nose/plugins/knownfailure.py b/...tlib/testing/nose/plugins/knownfailure.py → ...lib/testing/_nose/plugins/knownfailure.py
diff --git a/...plotlib/testing/nose/plugins/performgc.py → ...lotlib/testing/_nose/plugins/performgc.py b/...plotlib/testing/nose/plugins/performgc.py → ...lotlib/testing/_nose/plugins/performgc.py
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -40,7 +40,7 @@ def skipif(condition, *args, **kwargs):
         import pytest
         return pytest.mark.skipif(condition, *args, **kwargs)
     else:
-        from .nose.decorators import skipif
+        from ._nose.decorators import skipif
         return skipif(condition, *args, **kwargs)
 
 
@@ -65,7 +65,7 @@ def knownfailureif(fail_condition, msg=None, known_exception_class=None):
         return pytest.mark.xfail(condition=fail_condition, reason=msg,
                                  raises=known_exception_class, strict=strict)
     else:
-        from .nose.decorators import knownfailureif
+        from ._nose.decorators import knownfailureif
         return knownfailureif(fail_condition, msg, known_exception_class)
 
 
@@ -340,7 +340,7 @@ def wrapper(extension):
 
 
         # sadly we cannot use fixture here because of visibility problems
-        # and for for obvious reason avoid `nose.tools.with_setup`
+        # and for for obvious reason avoid `_nose.tools.with_setup`
         wrapper.setup, wrapper.teardown = self.setup, self.teardown
 
         return wrapper

diff --git a/lib/matplotlib/testing/noseclasses.py b/lib/matplotlib/testing/noseclasses.py
@@ -0,0 +1,26 @@
+"""
+The module testing.noseclasses is deprecated as of 2.1
+"""
+
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
+try:
+    from ._nose.plugins.knownfailure import KnownFailure as _KnownFailure
+    has_nose = True
+except ImportError:
+    has_nose = False
+    _KnownFailure = object
+
+from .. import cbook
+
+cbook.warn_deprecated(
+    since="2.1",
+    message="The noseclass module has been deprecated in 2.1 and will "
+            "be removed in matplotlib 2.3.")
+
+
+@cbook.deprecated("2.1")
+class KnownFailure(_KnownFailure):
+    def __init__(self):
+        if not has_nose:
+            raise ImportError("Need nose for this plugin.")
diff --git a/setupext.py b/setupext.py
@@ -713,8 +713,8 @@ def get_packages(self):
             'matplotlib.sphinxext',
             'matplotlib.style',
             'matplotlib.testing',
-            'matplotlib.testing.nose',
-            'matplotlib.testing.nose.plugins',
+            'matplotlib.testing._nose',
+            'matplotlib.testing._nose.plugins',
             'matplotlib.testing.jpl_units',
             'matplotlib.tri',
             'matplotlib.cbook'