diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2017-07-06 14:31:01 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-06 14:31:01 -0600 |
| commit | 698ddea57384e12bbdea18592b36b33566ca49b0 (patch) | |
| tree | 069bf63c590b4b38527f9baa1147fb843b6b89ac /numpy/lib/tests | |
| parent | 1b5f61ead26ace5809811920ebaad1aee409c7b5 (diff) | |
| parent | 974ce6f144e79d5edf7076e14cf35c01c97536dc (diff) | |
| download | numpy-698ddea57384e12bbdea18592b36b33566ca49b0.tar.gz | |
Merge pull request #9362 from charris/rearrange-testing-module
ENH: Rearrange testing module to isolate nose dependency.
Diffstat (limited to 'numpy/lib/tests')
| -rw-r--r-- | numpy/lib/tests/test_function_base.py | 3 | ||||
| -rw-r--r-- | numpy/lib/tests/test_regression.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py index 4000b55f5..f6d4b6111 100644 --- a/numpy/lib/tests/test_function_base.py +++ b/numpy/lib/tests/test_function_base.py @@ -10,9 +10,8 @@ from numpy.testing import ( run_module_suite, TestCase, assert_, assert_equal, assert_array_equal, assert_almost_equal, assert_array_almost_equal, assert_raises, assert_allclose, assert_array_max_ulp, assert_warns, - assert_raises_regex, dec, suppress_warnings + assert_raises_regex, dec, suppress_warnings, HAS_REFCOUNT, ) -from numpy.testing.utils import HAS_REFCOUNT import numpy.lib.function_base as nfb from numpy.random import rand from numpy.lib import ( diff --git a/numpy/lib/tests/test_regression.py b/numpy/lib/tests/test_regression.py index ad685946b..6095ac4ba 100644 --- a/numpy/lib/tests/test_regression.py +++ b/numpy/lib/tests/test_regression.py @@ -6,9 +6,8 @@ import sys import numpy as np from numpy.testing import ( run_module_suite, TestCase, assert_, assert_equal, assert_array_equal, - assert_array_almost_equal, assert_raises + assert_array_almost_equal, assert_raises, _assert_valid_refcount, ) -from numpy.testing.utils import _assert_valid_refcount from numpy.compat import unicode rlevel = 1 |