diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2017-07-04 13:47:45 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2017-07-04 19:51:58 -0600 |
| commit | ae84af3b6e6d96e4be408e8a56408290ee1879db (patch) | |
| tree | 0eff73d96f270e8d3aed3fc660e9926f023fde0d /numpy/f2py/f2py_testing.py | |
| parent | 0e4253526c727f50696f6233fee3d50a419ba9fe (diff) | |
| download | numpy-ae84af3b6e6d96e4be408e8a56408290ee1879db.tar.gz | |
MAINT: Rearrange files in numpy/testing module.
The aim here is to separate out the nose dependent files prior to adding
pytest support. This could be done by adding new files to the general
numpy/testing directory, but I felt that it was to have the relevant
files separated out as it makes it easier to completely remove nose
dependencies when needed.
Many places were accessing submodules in numpy/testing directly, and in
some cases incorrectly. That presented a backwards compatibility
problem. The solution adapted here is to have "dummy" files whose
contents will depend on whether of not pytest is active. That way the
module looks the same as before from the outside.
In the case of numpy itself, direct accesses have been fixed. Having
proper `__all__` lists in the submodules helped in that.
Diffstat (limited to 'numpy/f2py/f2py_testing.py')
| -rw-r--r-- | numpy/f2py/f2py_testing.py | 2 |
1 files changed, 1 insertions, 1 deletions
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(): |