diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2018-04-04 10:33:07 -0600 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2018-04-06 18:20:56 -0600 |
commit | 7bf0564f87511d9e7b6287b3eec0857d0d7742df (patch) | |
tree | 0f61ebbad4144e802a8966015741b2d309be696e /numpy/matrixlib/tests | |
parent | 036151143bff1eebeded5582534e676a192352cd (diff) | |
download | numpy-7bf0564f87511d9e7b6287b3eec0857d0d7742df.tar.gz |
MAINT: Remove all uses of run_module_suite.
That function is nose specific and has not worked since `__init__` files
were added to the tests directories.
Diffstat (limited to 'numpy/matrixlib/tests')
-rw-r--r-- | numpy/matrixlib/tests/test_defmatrix.py | 10 | ||||
-rw-r--r-- | numpy/matrixlib/tests/test_multiarray.py | 7 | ||||
-rw-r--r-- | numpy/matrixlib/tests/test_numeric.py | 6 | ||||
-rw-r--r-- | numpy/matrixlib/tests/test_regression.py | 7 |
4 files changed, 6 insertions, 24 deletions
diff --git a/numpy/matrixlib/tests/test_defmatrix.py b/numpy/matrixlib/tests/test_defmatrix.py index d5435a1a3..a02a05c09 100644 --- a/numpy/matrixlib/tests/test_defmatrix.py +++ b/numpy/matrixlib/tests/test_defmatrix.py @@ -10,9 +10,9 @@ except ImportError: import numpy as np from numpy import matrix, asmatrix, bmat from numpy.testing import ( - run_module_suite, assert_, assert_equal, assert_almost_equal, - assert_array_equal, assert_array_almost_equal, assert_raises -) + assert_, assert_equal, assert_almost_equal, assert_array_equal, + assert_array_almost_equal, assert_raises + ) from numpy.matrixlib.defmatrix import matrix_power from numpy.matrixlib import mat @@ -458,7 +458,3 @@ class TestShape(object): def test_matrix_memory_sharing(self): assert_(np.may_share_memory(self.m, self.m.ravel())) assert_(not np.may_share_memory(self.m, self.m.flatten())) - - -if __name__ == "__main__": - run_module_suite() diff --git a/numpy/matrixlib/tests/test_multiarray.py b/numpy/matrixlib/tests/test_multiarray.py index bf891a196..6d84bd477 100644 --- a/numpy/matrixlib/tests/test_multiarray.py +++ b/numpy/matrixlib/tests/test_multiarray.py @@ -1,9 +1,7 @@ from __future__ import division, absolute_import, print_function import numpy as np -from numpy.testing import ( - run_module_suite, assert_, assert_equal, assert_array_equal -) +from numpy.testing import assert_, assert_equal, assert_array_equal class TestView(object): def test_type(self): @@ -18,6 +16,3 @@ class TestView(object): assert_(isinstance(y, np.matrix)) assert_equal(y.dtype, np.dtype('<i2')) - -if __name__ == "__main__": - run_module_suite() diff --git a/numpy/matrixlib/tests/test_numeric.py b/numpy/matrixlib/tests/test_numeric.py index b826b8e81..95e1c8001 100644 --- a/numpy/matrixlib/tests/test_numeric.py +++ b/numpy/matrixlib/tests/test_numeric.py @@ -1,7 +1,7 @@ from __future__ import division, absolute_import, print_function import numpy as np -from numpy.testing import assert_equal, run_module_suite +from numpy.testing import assert_equal class TestDot(object): def test_matscalar(self): @@ -17,7 +17,3 @@ def test_diagonal(): assert_equal(b1.diagonal(), diag_b1) assert_equal(np.diagonal(b1), array_b1) assert_equal(np.diag(b1), array_b1) - - -if __name__ == "__main__": - run_module_suite() diff --git a/numpy/matrixlib/tests/test_regression.py b/numpy/matrixlib/tests/test_regression.py index 32cb38ac7..70e147279 100644 --- a/numpy/matrixlib/tests/test_regression.py +++ b/numpy/matrixlib/tests/test_regression.py @@ -1,9 +1,7 @@ from __future__ import division, absolute_import, print_function import numpy as np -from numpy.testing import ( - run_module_suite, assert_, assert_equal, assert_raises - ) +from numpy.testing import assert_, assert_equal, assert_raises class TestRegression(object): @@ -33,6 +31,3 @@ class TestRegression(object): x = np.asmatrix(np.random.uniform(0, 1, (3, 3))) assert_equal(x.std().shape, ()) assert_equal(x.argmax().shape, ()) - -if __name__ == "__main__": - run_module_suite() |