diff options
author | Eric Wieser <wieser.eric@gmail.com> | 2018-05-25 23:07:21 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-25 23:07:21 -0700 |
commit | a10b4270d4b3f538254698874560d645c0525dc5 (patch) | |
tree | e8ff62b91d0477b56042b879d489e59ba807fed7 /numpy/matrixlib/tests/test_multiarray.py | |
parent | 0addc016ba7000b27509663f4f489c6eb1838056 (diff) | |
parent | c1fc882277bcec42e11f67c6eced43d68cec4d7a (diff) | |
download | numpy-a10b4270d4b3f538254698874560d645c0525dc5.tar.gz |
Merge branch 'master' into force-tuple
Diffstat (limited to 'numpy/matrixlib/tests/test_multiarray.py')
-rw-r--r-- | numpy/matrixlib/tests/test_multiarray.py | 7 |
1 files changed, 1 insertions, 6 deletions
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() |