diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2018-03-27 09:26:43 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2018-03-29 11:41:35 -0600 |
| commit | 157aedaa50d3c5fc74b45c79fb8b8c4b650217ac (patch) | |
| tree | 3c537ff46b4e0c031e791aeb85487be2eb9c782d /numpy/distutils/__init__.py | |
| parent | e4d678a2f5859d29a853d617e9e5bbd4b6241898 (diff) | |
| download | numpy-157aedaa50d3c5fc74b45c79fb8b8c4b650217ac.tar.gz | |
MAINT: Rearrange numpy/testing files.
This is to prepare for the switch to pytest.
* Rename `numpy/testing/nose_tools` to `numpy/testing/_private`.
* Redirect imports as needed.
* Copy `_testutils.py` from scipy to `numpy/testing/_private`.
* Rename `_testutils.py` to `_pytester.py` and remove unneeded bits.
Diffstat (limited to 'numpy/distutils/__init__.py')
| -rw-r--r-- | numpy/distutils/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/distutils/__init__.py b/numpy/distutils/__init__.py index 0450334ff..d5921b399 100644 --- a/numpy/distutils/__init__.py +++ b/numpy/distutils/__init__.py @@ -17,7 +17,7 @@ try: # Normally numpy is installed if the above import works, but an interrupted # in-place build could also have left a __config__.py. In that case the # next import may still fail, so keep it inside the try block. - from numpy.testing.nosetester import _numpy_tester + from numpy.testing import _numpy_tester test = _numpy_tester().test except ImportError: pass @@ -26,7 +26,7 @@ except ImportError: def customized_fcompiler(plat=None, compiler=None): from numpy.distutils.fcompiler import new_fcompiler c = new_fcompiler(plat=plat, compiler=compiler) - c.customize() + c.customize() return c def customized_ccompiler(plat=None, compiler=None): |