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/f2py | |
| 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/f2py')
| -rw-r--r-- | numpy/f2py/__init__.py | 2 | ||||
| -rw-r--r-- | numpy/f2py/f2py_testing.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py index b9b86ba0e..250c4322b 100644 --- a/numpy/f2py/__init__.py +++ b/numpy/f2py/__init__.py @@ -69,6 +69,6 @@ def compile(source, f.close() return status -from numpy.testing.nosetester import _numpy_tester +from numpy.testing import _numpy_tester test = _numpy_tester().test bench = _numpy_tester().bench diff --git a/numpy/f2py/f2py_testing.py b/numpy/f2py/f2py_testing.py index c7041fe25..f5d5fa63d 100644 --- a/numpy/f2py/f2py_testing.py +++ b/numpy/f2py/f2py_testing.py @@ -3,7 +3,7 @@ from __future__ import division, absolute_import, print_function import sys import re -from numpy.testing.utils import jiffies, memusage +from numpy.testing import jiffies, memusage def cmdline(): |