diff options
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/tests/test_dtype.py | 3 | ||||
| -rw-r--r-- | numpy/core/tests/test_multiarray.py | 4 | ||||
| -rw-r--r-- | numpy/core/tests/test_regression.py | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/numpy/core/tests/test_dtype.py b/numpy/core/tests/test_dtype.py index 18146cae2..06fca25fb 100644 --- a/numpy/core/tests/test_dtype.py +++ b/numpy/core/tests/test_dtype.py @@ -9,11 +9,10 @@ import numpy as np from numpy.core._rational_tests import rational from numpy.core._multiarray_tests import create_custom_field_dtype from numpy.testing import ( - assert_, assert_equal, assert_array_equal, assert_raises, HAS_REFCOUNT) + assert_, assert_equal, assert_array_equal, assert_raises, HAS_REFCOUNT, IS_PYSTON) from numpy.compat import pickle from itertools import permutations -IS_PYSTON = hasattr(sys, "pyston_version_info") def assert_dtype_equal(a, b): assert_equal(a, b) diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py index 63095b426..b36b35938 100644 --- a/numpy/core/tests/test_multiarray.py +++ b/numpy/core/tests/test_multiarray.py @@ -25,7 +25,7 @@ from numpy.core._rational_tests import rational from numpy.testing import ( assert_, assert_raises, assert_warns, assert_equal, assert_almost_equal, assert_array_equal, assert_raises_regex, assert_array_almost_equal, - assert_allclose, IS_PYPY, HAS_REFCOUNT, assert_array_less, runstring, + assert_allclose, IS_PYPY, IS_PYSTON, HAS_REFCOUNT, assert_array_less, runstring, temppath, suppress_warnings, break_cycles, ) from numpy.testing._private.utils import _no_tracing @@ -8031,7 +8031,7 @@ class TestConversion: assert_raises(NotImplementedError, bool, np.array(NotConvertible())) assert_raises(NotImplementedError, bool, np.array([NotConvertible()])) - if hasattr(sys, "pyston_version_info"): + if IS_PYSTON: pytest.skip("Pyston disables recursion checking") self_containing = np.array([None]) diff --git a/numpy/core/tests/test_regression.py b/numpy/core/tests/test_regression.py index 14af3db5f..21cc8c159 100644 --- a/numpy/core/tests/test_regression.py +++ b/numpy/core/tests/test_regression.py @@ -12,7 +12,7 @@ from numpy.testing import ( assert_, assert_equal, IS_PYPY, assert_almost_equal, assert_array_equal, assert_array_almost_equal, assert_raises, assert_raises_regex, assert_warns, suppress_warnings, - _assert_valid_refcount, HAS_REFCOUNT, + _assert_valid_refcount, HAS_REFCOUNT, IS_PYSTON ) from numpy.testing._private.utils import _no_tracing, requires_memory from numpy.compat import asbytes, asunicode, pickle @@ -22,7 +22,7 @@ try: except NameError: RecursionError = RuntimeError # python < 3.5 -IS_PYSTON = hasattr(sys, "pyston_version_info") + class TestRegression: def test_invalid_round(self): |