Remove pytest_pycollect_makeitem.

QuLogic · QuLogic · commit 8351014b3e7a · 2017-01-31T17:58:45.000-05:00
There's only one class that requires this modification, so it can just
be fixed.
diff --git a/conftest.py b/conftest.py
@@ -80,23 +80,3 @@ def pytest_ignore_collect(path, config):
     if path.ext == '.py':
         collect_filter = config.getoption('--collect-filter')
         return COLLECT_FILTERS[collect_filter](path)
-
-
-def pytest_pycollect_makeitem(collector, name, obj):
-    if inspect.isclass(obj):
-        if is_nose_class(obj) and not issubclass(obj, unittest.TestCase):
-            # Workaround unittest-like setup/teardown names in pure classes
-            setup = getattr(obj, 'setUp', None)
-            if setup is not None:
-                obj.setup_method = lambda self, _: obj.setUp(self)
-            tearDown = getattr(obj, 'tearDown', None)
-            if tearDown is not None:
-                obj.teardown_method = lambda self, _: obj.tearDown(self)
-            setUpClass = getattr(obj, 'setUpClass', None)
-            if setUpClass is not None:
-                obj.setup_class = obj.setUpClass
-            tearDownClass = getattr(obj, 'tearDownClass', None)
-            if tearDownClass is not None:
-                obj.teardown_class = obj.tearDownClass
-
-            return pytest.Class(name, parent=collector)
diff --git a/lib/matplotlib/tests/test_cbook.py b/lib/matplotlib/tests/test_cbook.py
@@ -68,7 +68,7 @@ def test_restrict_dict():
 
 
 class Test_delete_masked_points(object):
-    def setUp(self):
+    def setup_method(self):
         self.mask1 = [False, False, True, True, False, False]
         self.arr0 = np.arange(1.0, 7.0)
         self.arr1 = [1, 2, 3, np.nan, np.nan, 6]
