Changeset 7318485

Timestamp:

Nov 2, 2018, 6:01:52 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/timestretch, fix/ffmpeg5, master

Children:

0cc8514

Parents:

9a1df7f

Message:

[py] remove nose2

File:

• python/tests/_tools.py (modified) (2 diffs)

python/tests/_tools.py

@@ -3 +3 @@
 order:
 
-    - if 'nose2' is found in the list of loaded module, use it
-    - otherwise, try using 'pytest'
-    - if that also fails, fallback to 'numpy.testing'
+    - try importing 'pytest'
+    - if it fails, fallback to 'numpy.testing'
+
+Nose2 support was removed because of lacking assertWarns on py2.7.
+
 """
 
@@ -11 +13 @@
 
 _has_pytest = False
-_has_nose2 = False
 
-# if nose2 has already been imported, use it
-if 'nose2' in sys.modules:
-    from nose2.tools import params, such
-    def parametrize(argnames, argvalues):
-        return params(*argvalues)
-    assert_raises = such.helper.assertRaises
-    assert_warns = such.helper.assertWarns
-    skipTest = such.helper.skipTest
-    _has_nose2 = True
-
-# otherwise, check if we have pytest
-if not _has_nose2:
-    try:
-        import pytest
-        parametrize = pytest.mark.parametrize
-        assert_raises = pytest.raises
-        assert_warns = pytest.warns
-        skipTest = pytest.skip
-        _has_pytest = True
-    except:
-        pass
+# check if we have pytest
+try:
+    import pytest
+    parametrize = pytest.mark.parametrize
+    assert_raises = pytest.raises
+    assert_warns = pytest.warns
+    skipTest = pytest.skip
+    _has_pytest = True
+except:
+    pass
 
 # otherwise fallback on numpy.testing
-if not _has_pytest and not _has_nose2:
+if not _has_pytest:
     from numpy.testing import dec, assert_raises, assert_warns
     from numpy.testing import SkipTest