Merge pull request #247 from numpy/matrixlib-matlib

🏷️ fix stubtest errors in `numpy.mat[rix]lib`

Author: jorenham

.mypyignore-todo

@@ -8,7 +8,6 @@ numpy(\..+)?\.floating.as_integer_ratio
 numpy(\..+)?\.complexfloating.__hash__
 numpy(\..+)?\.complexfloating.__complex__
 
-numpy(\.matrixlib(\.defmatrix)?|\.matlib)?\.matrix\.__new__
 numpy(\.lib\._polynomial_impl|\.matlib)?\.poly1d\.integ
 
 numpy._globals._CopyMode.IF_NEEDED
@@ -78,16 +77,6 @@ numpy.ma.core.mask_rowcols
 numpy.ma.extras.MAxisConcatenator.concatenate
 numpy.ma.mrecords.fromtextfile
 
-numpy.matlib.f2py
-numpy.matlib.typing
-numpy.matlib.cdouble
-numpy.matlib.hanning
-numpy.matlib.in1d
-numpy.matlib.split
-numpy.matlib.stack
-
-numpy.matrixlib.defmatrix.mat
-
 numpy.polynomial.Chebyshev.basis_name
 numpy.polynomial.Hermite.basis_name
 numpy.polynomial.HermiteE.basis_name

src/numpy-stubs/matlib.pyi

@@ -90,6 +90,7 @@ from numpy import (  # noqa: ICN003
     c_,
     can_cast,
     cbrt,
+    cdouble,
     ceil,
     char,
     character,
@@ -161,6 +162,7 @@ from numpy import (  # noqa: ICN003
     expand_dims,
     expm1,
     extract,
+    f2py,
     fabs,
     fft,
     fill_diagonal,
@@ -210,6 +212,7 @@ from numpy import (  # noqa: ICN003
     greater_equal,
     half,
     hamming,
+    hanning,
     heaviside,
     histogram,
     histogram2d,
@@ -221,6 +224,7 @@ from numpy import (  # noqa: ICN003
     i0,
     iinfo,
     imag,
+    in1d,
     index_exp,
     indices,
     inexact,
@@ -427,9 +431,11 @@ from numpy import (  # noqa: ICN003
     sort,
     sort_complex,
     spacing,
+    split,
     sqrt,
     square,
     squeeze,
+    stack,
     std,
     str_,
     strings,
@@ -461,6 +467,7 @@ from numpy import (  # noqa: ICN003
     trunc,
     typecodes,
     typename,
+    typing,  # noqa: ICN001
     ubyte,
     ufunc,
     uint,

src/numpy-stubs/matrixlib/defmatrix.pyi

@@ -48,7 +48,7 @@ class matrix(np.ndarray[_ShapeT_co, _DTypeT_co]):
     __array_priority__: ClassVar[float] = 10.0  # pyright: ignore[reportIncompatibleMethodOverride]
 
     #
-    def __new__(cls, data: ArrayLike, dtype: DTypeLike | None = None, copy: bool = ...) -> Matrix: ...
+    def __new__(subtype, data: ArrayLike, dtype: DTypeLike | None = None, copy: bool = ...) -> Matrix: ...
 
     #
     @overload  # type: ignore[override]
@@ -321,5 +321,3 @@ def asmatrix(data: ToBytes_nd, dtype: None = None) -> Matrix[np.bytes_]: ...
 def asmatrix(data: ToStr_nd, dtype: None = None) -> Matrix[np.str_]: ...
 @overload
 def asmatrix(data: ToGeneric_nd, dtype: DTypeLike | None) -> Matrix: ...
-
-mat = asmatrix