tests.py should now act more like the old nose version did,

pizzathief · pizzathief · commit 56d99ed34ca2 · 2016-01-21T12:09:03.000+11:00
using pytest. also fixed up problem  in test_labeled_data_unpacking,
relating to '==' on two lines.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1515,21 +1515,22 @@ def _init_tests():
             "Expect many image comparison failures below.")
 
     try:
-        import nose
+        # import nose
         try:
             from unittest import mock
         except:
             import mock
     except ImportError:
-        print("matplotlib.test requires nose and mock to run.")
+        print("matplotlib.test requires mock to run. nose is currently being removed")
         raise
 
 
 def _get_extra_test_plugins():
-    from .testing.noseclasses import KnownFailure
-    from nose.plugins import attrib
+    # from .testing.noseclasses import KnownFailure
+    # from nose.plugins import attrib
 
-    return [KnownFailure, attrib.Plugin]
+    #return [KnownFailure, attrib.Plugin]
+    pass
 
 
 def _get_nose_env():
diff --git a/lib/matplotlib/tests/test_labeled_data_unpacking.py b/lib/matplotlib/tests/test_labeled_data_unpacking.py
@@ -346,10 +346,8 @@ def funcy(ax, *args, **kwargs):
 
     # the normal case...
     data = {"x": "X", "hy1": "Y"}
-    assert funcy(None, "x", "hy1", data=data) ==
-                 "('X', 'Y') | {}"
-    assert funcy(None, "x", "hy1", "c", data=data) ==
-                 "('X', 'Y', 'c') | {}"
+    assert funcy(None, "x", "hy1", data=data) == "('X', 'Y') | {}"
+    assert funcy(None, "x", "hy1", "c", data=data) == "('X', 'Y', 'c') | {}"
 
     # no arbitrary long args with data
     def f():
diff --git a/tests.py b/tests.py
@@ -16,12 +16,13 @@
 import matplotlib
 matplotlib.use('agg')
 
-import nose
+# import nose
+import pytest
 from matplotlib import default_test_modules
 
 
 def run(extra_args):
-    from nose.plugins import multiprocess
+    # from nose.plugins import multiprocess
 
     env = matplotlib._get_nose_env()
 
@@ -30,13 +31,17 @@ def run(extra_args):
     # Nose doesn't automatically instantiate all of the plugins in the
     # child processes, so we have to provide the multiprocess plugin with
     # a list.
-    plugins = matplotlib._get_extra_test_plugins()
-    multiprocess._instantiate_plugins = plugins
+    # plugins = matplotlib._get_extra_test_plugins()
+    # multiprocess._instantiate_plugins = plugins
 
-    nose.main(addplugins=[x() for x in plugins],
-              defaultTest=default_test_modules,
-              argv=sys.argv + extra_args,
-              env=env)
+    # nose.main(addplugins=[x() for x in plugins],
+    #           defaultTest=default_test_modules,
+    #           argv=sys.argv + extra_args,
+    #           env=env)
+
+    argv = sys.argv + extra_args
+    for test_module in default_test_modules:
+        pytest.main(' '.join(argv[1:]) + ' ' + " --pyargs %s" % test_module)
 
 if __name__ == '__main__':
     extra_args = []
