diff options
| author | Alan McIntyre <alan.mcintyre@local> | 2008-06-17 02:17:34 +0000 |
|---|---|---|
| committer | Alan McIntyre <alan.mcintyre@local> | 2008-06-17 02:17:34 +0000 |
| commit | 2bdd23ef6ddabcf24ef68f08fe7a737e4b52f355 (patch) | |
| tree | e2a6f8f65cd88e8cfc5420f9a52fd80ed73f4cab /numpy/testing/pkgtester.py | |
| parent | 70974af863b99d49d9a1cf947afc019976e6b8b4 (diff) | |
| download | numpy-2bdd23ef6ddabcf24ef68f08fe7a737e4b52f355.tar.gz | |
Update README.txt to indicate nose version dependency, and port SciPy r4424 to NumPy
(prevent import of nose until actual execution of tests). Restored
"raises" function to numpy/testing/utils.py until it can be replaced with the function of
the same name from nose.tools after the lazy import.
Diffstat (limited to 'numpy/testing/pkgtester.py')
| -rw-r--r-- | numpy/testing/pkgtester.py | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/numpy/testing/pkgtester.py b/numpy/testing/pkgtester.py index 8b22955fa..51e8d62c4 100644 --- a/numpy/testing/pkgtester.py +++ b/numpy/testing/pkgtester.py @@ -11,17 +11,4 @@ test = Tester().test See nosetester module for test implementation ''' -fine_nose = True -try: - import nose -except ImportError: - fine_nose = False -else: - nose_version = nose.__versioninfo__ - if nose_version[0] < 1 and nose_version[1] < 10: - fine_nose = False - -if fine_nose: - from numpy.testing.nosetester import NoseTester as Tester -else: - from numpy.testing.nulltester import NullTester as Tester +from numpy.testing.nosetester import NoseTester as Tester |