diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2018-04-22 14:09:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 14:09:43 -0700 |
| commit | 80de28de294b24f926133a86176f64f6a13c5411 (patch) | |
| tree | 33aaa221ac82a571243adb56a60359240bb52507 /numpy/testing/__init__.py | |
| parent | 14e64281cfe374a9cad476599cbe9b4fa850efb7 (diff) | |
| parent | b5c1bcf1e8ef6e9c11bb4138a15286e648fcbce0 (diff) | |
| download | numpy-80de28de294b24f926133a86176f64f6a13c5411.tar.gz | |
Merge branch 'master' into npzfile-mappin
Diffstat (limited to 'numpy/testing/__init__.py')
| -rw-r--r-- | numpy/testing/__init__.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/numpy/testing/__init__.py b/numpy/testing/__init__.py index 9485b455e..a7c85931c 100644 --- a/numpy/testing/__init__.py +++ b/numpy/testing/__init__.py @@ -9,7 +9,14 @@ from __future__ import division, absolute_import, print_function from unittest import TestCase -from . import decorators as dec -from .nosetester import run_module_suite, NoseTester as Tester, _numpy_tester -from .utils import * -test = _numpy_tester().test +from ._private.utils import * +from ._private import decorators as dec +from ._private.nosetester import ( + run_module_suite, NoseTester as Tester + ) + +__all__ = _private.utils.__all__ + ['TestCase', 'run_module_suite'] + +from ._private.pytesttester import PytestTester +test = PytestTester(__name__) +del PytestTester |