diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2020-12-13 14:14:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-13 14:14:49 -0700 |
| commit | 3fe2d9d2627fc0f84aeed293ff8afa7c1f08d899 (patch) | |
| tree | 2ea27fe06a19c39e8d7a5fe2f87cb7e05363247d /numpy/matrixlib | |
| parent | 7d7e446fcbeeff70d905bde2eb0264a797488280 (diff) | |
| parent | eff302e5e8678fa17fb3d8156d49eb585b0876d9 (diff) | |
| download | numpy-3fe2d9d2627fc0f84aeed293ff8afa7c1f08d899.tar.gz | |
Merge branch 'master' into fix-issue-10244
Diffstat (limited to 'numpy/matrixlib')
| -rw-r--r-- | numpy/matrixlib/__init__.pyi | 6 | ||||
| -rw-r--r-- | numpy/matrixlib/setup.py | 1 | ||||
| -rw-r--r-- | numpy/matrixlib/tests/test_masked_matrix.py | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/numpy/matrixlib/__init__.pyi b/numpy/matrixlib/__init__.pyi new file mode 100644 index 000000000..b240bb327 --- /dev/null +++ b/numpy/matrixlib/__init__.pyi @@ -0,0 +1,6 @@ +from typing import Any + +matrix: Any +bmat: Any +mat: Any +asmatrix: Any diff --git a/numpy/matrixlib/setup.py b/numpy/matrixlib/setup.py index 19b3bb2de..4fed75de1 100644 --- a/numpy/matrixlib/setup.py +++ b/numpy/matrixlib/setup.py @@ -3,6 +3,7 @@ def configuration(parent_package='', top_path=None): from numpy.distutils.misc_util import Configuration config = Configuration('matrixlib', parent_package, top_path) config.add_subpackage('tests') + config.add_data_files('*.pyi') return config if __name__ == "__main__": diff --git a/numpy/matrixlib/tests/test_masked_matrix.py b/numpy/matrixlib/tests/test_masked_matrix.py index 45424ecf0..95d3f44b6 100644 --- a/numpy/matrixlib/tests/test_masked_matrix.py +++ b/numpy/matrixlib/tests/test_masked_matrix.py @@ -1,4 +1,5 @@ import numpy as np +from numpy.testing import assert_warns from numpy.ma.testutils import (assert_, assert_equal, assert_raises, assert_array_equal) from numpy.ma.core import (masked_array, masked_values, masked, allequal, @@ -198,7 +199,8 @@ class TestSubclassing: # Result should work assert_equal(add(mx, x), mx+x) assert_(isinstance(add(mx, mx)._data, np.matrix)) - assert_(isinstance(add.outer(mx, mx), MMatrix)) + with assert_warns(DeprecationWarning): + assert_(isinstance(add.outer(mx, mx), MMatrix)) assert_(isinstance(hypot(mx, mx), MMatrix)) assert_(isinstance(hypot(mx, x), MMatrix)) |