diff options
| author | xoviat <xoviat@users.noreply.github.com> | 2017-12-22 15:57:04 -0600 |
|---|---|---|
| committer | xoviat <xoviat@users.noreply.github.com> | 2017-12-22 17:31:02 -0600 |
| commit | 0f7a8b3dfbd9c99162074aeebc80981cfd3decbb (patch) | |
| tree | 2a89a08f787390302251f06911bfc6aa07ea8c5e | |
| parent | 6cd348d5a830c67be62b9e71ffa30033c3ba9e7f (diff) | |
| download | numpy-0f7a8b3dfbd9c99162074aeebc80981cfd3decbb.tar.gz | |
ENH: do backward compatibility correctly
| -rw-r--r-- | numpy/conftest.py | 11 | ||||
| -rw-r--r-- | numpy/testing/decorators.py | 5 | ||||
| -rw-r--r-- | numpy/testing/nosetester.py | 5 | ||||
| -rw-r--r-- | numpy/testing/utils.py | 5 |
4 files changed, 14 insertions, 12 deletions
diff --git a/numpy/conftest.py b/numpy/conftest.py index d3db866a7..15985a75b 100644 --- a/numpy/conftest.py +++ b/numpy/conftest.py @@ -6,6 +6,7 @@ from __future__ import division, absolute_import, print_function import warnings import pytest import numpy +import importlib from numpy.core.multiarray_tests import get_fpu_mode @@ -73,3 +74,13 @@ def pytest_collection_modifyitems(config, items): @pytest.fixture(autouse=True) def add_np(doctest_namespace): doctest_namespace['np'] = numpy + + +for module, replacement in { + 'numpy.testing.decorators': 'numpy.testing.pytest_tools.decorators', + 'numpy.testing.utils': 'numpy.testing.pytest_tools.utils', +}.items(): + module = importlib.import_module(module) + replacement = importlib.import_module(replacement) + module.__dict__.clear() + module.__dict__.update(replacement.__dict__) diff --git a/numpy/testing/decorators.py b/numpy/testing/decorators.py index 1fe72e2e3..21bcdd798 100644 --- a/numpy/testing/decorators.py +++ b/numpy/testing/decorators.py @@ -5,7 +5,4 @@ set of tools """ import os -if int(os.getenv('NPY_PYTEST', '0')): - from .pytest_tools.decorators import * -else: - from .nose_tools.decorators import * +from .nose_tools.decorators import * diff --git a/numpy/testing/nosetester.py b/numpy/testing/nosetester.py index 59a7f4c7a..949fae03e 100644 --- a/numpy/testing/nosetester.py +++ b/numpy/testing/nosetester.py @@ -5,10 +5,7 @@ set of tools """ import os -if int(os.getenv('NPY_PYTEST', '0')): - from .pytest_tools.nosetester import * -else: - from .nose_tools.nosetester import * +from .nose_tools.nosetester import * __all__ = ['get_package_name', 'run_module_suite', 'NoseTester', diff --git a/numpy/testing/utils.py b/numpy/testing/utils.py index 985fbf77d..a0218c4e6 100644 --- a/numpy/testing/utils.py +++ b/numpy/testing/utils.py @@ -5,10 +5,7 @@ set of tools """ import os -if int(os.getenv('NPY_PYTEST', '0')): - from .pytest_tools.utils import * -else: - from .nose_tools.utils import * +from .nose_tools.utils import * __all__ = [ 'assert_equal', 'assert_almost_equal', 'assert_approx_equal', |