Remove nosetest with_setup

Joan Massich · Joan Massich · commit ad12049fada5 · 2017-09-01T14:16:40.000+02:00
diff --git a/sklearn/datasets/tests/test_base.py b/sklearn/datasets/tests/test_base.py
@@ -27,7 +27,6 @@
 from sklearn.utils.testing import assert_equal
 from sklearn.utils.testing import assert_raises
 from sklearn.utils.testing import assert_array_equal
-from sklearn.utils.testing import with_setup
 
 
 DATA_HOME = tempfile.mkdtemp(prefix="scikit_learn_data_home_test_")
@@ -85,33 +84,36 @@ def test_default_empty_load_files():
     assert_equal(res.DESCR, None)
 
 
-@with_setup(setup_load_files, teardown_load_files)
 def test_default_load_files():
+    setup_load_files
     res = load_files(LOAD_FILES_ROOT)
     assert_equal(len(res.filenames), 1)
     assert_equal(len(res.target_names), 2)
     assert_equal(res.DESCR, None)
     assert_equal(res.data, [b("Hello World!\n")])
+    teardown_load_files
 
 
-@with_setup(setup_load_files, teardown_load_files)
 def test_load_files_w_categories_desc_and_encoding():
+    setup_load_files
     category = os.path.abspath(TEST_CATEGORY_DIR1).split('/').pop()
     res = load_files(LOAD_FILES_ROOT, description="test",
                      categories=category, encoding="utf-8")
     assert_equal(len(res.filenames), 1)
     assert_equal(len(res.target_names), 1)
     assert_equal(res.DESCR, "test")
     assert_equal(res.data, [u("Hello World!\n")])
+    teardown_load_files
 
 
-@with_setup(setup_load_files, teardown_load_files)
 def test_load_files_wo_load_content():
+    setup_load_files
     res = load_files(LOAD_FILES_ROOT, load_content=False)
     assert_equal(len(res.filenames), 1)
     assert_equal(len(res.target_names), 2)
     assert_equal(res.DESCR, None)
     assert_equal(res.get('data'), None)
+    teardown_load_files
 
 
 def test_load_sample_images():
diff --git a/sklearn/datasets/tests/test_mldata.py b/sklearn/datasets/tests/test_mldata.py
@@ -13,7 +13,6 @@
 from sklearn.utils.testing import mock_mldata_urlopen
 from sklearn.utils.testing import assert_equal
 from sklearn.utils.testing import assert_raises
-from sklearn.utils.testing import with_setup
 from sklearn.utils.testing import assert_array_equal
 
 
@@ -43,10 +42,9 @@ def test_mldata_filename():
         assert_equal(mldata_filename(name), desired)
 
 
-@with_setup(setup_tmpdata, teardown_tmpdata)
 def test_download():
     """Test that fetch_mldata is able to download and cache a data set."""
-
+    setup_tmpdata
     _urlopen_ref = datasets.mldata.urlopen
     datasets.mldata.urlopen = mock_mldata_urlopen({
         'mock': {
@@ -66,10 +64,11 @@ def test_download():
                       fetch_mldata, 'not_existing_name')
     finally:
         datasets.mldata.urlopen = _urlopen_ref
+        teardown_tmpdata
 
 
-@with_setup(setup_tmpdata, teardown_tmpdata)
 def test_fetch_one_column():
+    setup_tmpdata
     _urlopen_ref = datasets.mldata.urlopen
     try:
         dataname = 'onecol'
@@ -90,10 +89,11 @@ def test_fetch_one_column():
         assert_equal(dset.data.shape, (3, 2))
     finally:
         datasets.mldata.urlopen = _urlopen_ref
+        teardown_tmpdata
 
 
-@with_setup(setup_tmpdata, teardown_tmpdata)
 def test_fetch_multiple_column():
+    setup_tmpdata
     _urlopen_ref = datasets.mldata.urlopen
     try:
         # create fake data set in cache
@@ -167,3 +167,4 @@ def test_fetch_multiple_column():
 
     finally:
         datasets.mldata.urlopen = _urlopen_ref
+        teardown_tmpdata
diff --git a/sklearn/utils/testing.py b/sklearn/utils/testing.py
@@ -56,7 +56,18 @@
     raises = deprecated(deprecation_message)(_nose_raises)
 except ImportError:
     pass
-from nose import with_setup
+
+try:
+    from nose.tools import with_setup as _with_setup
+    deprecation_message = (
+        'sklearn.utils.testing.with_setup has been deprecated in version 0.20 '
+        'and will be removed in 0.22.'
+        'If your code relies on with_setup, please use'
+        ' nose.tools.with_setup instead.')
+    with_setup = deprecated(deprecation_message)(_with_setup)
+except ImportError:
+    pass
+
 
 from numpy.testing import assert_almost_equal
 from numpy.testing import assert_array_equal
@@ -754,10 +765,6 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         _delete_folder(self.temp_folder)
 
 
-with_network = with_setup(check_skip_network)
-with_travis = with_setup(check_skip_travis)
-
-
 class _named_check(object):
     """Wraps a check to show a useful description
 
