From 53d853b6d172ab6e5a536873292b7cf866dbf630 Mon Sep 17 00:00:00 2001 From: jorenham Date: Mon, 29 Dec 2025 23:29:13 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=BD=EF=B8=8F=20`lib.=5Ftwodim=5Fbase?= =?UTF-8?q?=5Fimpl`=20sync=20with=20upstream?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/numpy-stubs/@test/static/accept/twodim_base.pyi | 6 +++--- src/numpy-stubs/lib/_twodim_base_impl.pyi | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/numpy-stubs/@test/static/accept/twodim_base.pyi b/src/numpy-stubs/@test/static/accept/twodim_base.pyi index 27b492b5..d8d1c291 100644 --- a/src/numpy-stubs/@test/static/accept/twodim_base.pyi +++ b/src/numpy-stubs/@test/static/accept/twodim_base.pyi @@ -29,9 +29,9 @@ assert_type(np.fliplr(AR_LIKE_b), _nt.Array) assert_type(np.flipud(AR_b), _nt.Array[np.bool]) assert_type(np.flipud(AR_LIKE_b), _nt.Array) -assert_type(np.eye(10), _nt.Array[np.float64]) -assert_type(np.eye(10, M=20, dtype=np.int64), _nt.Array[np.int64]) -assert_type(np.eye(10, k=2, dtype=int), _nt.Array) +assert_type(np.eye(10), _nt.Array2D[np.float64]) +assert_type(np.eye(10, M=20, dtype=np.int64), _nt.Array2D[np.int64]) +assert_type(np.eye(10, k=2, dtype=int), _nt.Array2D) assert_type(np.diag(AR_b), _nt.Array[np.bool]) assert_type(np.diag(AR_LIKE_b, k=0), _nt.Array2D) diff --git a/src/numpy-stubs/lib/_twodim_base_impl.pyi b/src/numpy-stubs/lib/_twodim_base_impl.pyi index 9bc7049d..9db0c7a3 100644 --- a/src/numpy-stubs/lib/_twodim_base_impl.pyi +++ b/src/numpy-stubs/lib/_twodim_base_impl.pyi @@ -75,7 +75,7 @@ def eye( *, device: _Device | None = None, like: _Like | None = None, -) -> _nt.Array[np.float64]: ... +) -> _nt.Array2D[np.float64]: ... @overload def eye( N: int, @@ -86,7 +86,7 @@ def eye( *, device: _Device | None = None, like: _Like | None = None, -) -> _nt.Array[_ScalarT]: ... +) -> _nt.Array2D[_ScalarT]: ... @overload def eye( N: int, @@ -97,7 +97,7 @@ def eye( order: _OrderCF = "C", device: _Device | None = None, like: _Like | None = None, -) -> _nt.Array[_ScalarT]: ... +) -> _nt.Array2D[_ScalarT]: ... @overload def eye( N: int, @@ -108,11 +108,11 @@ def eye( *, device: _Device | None = None, like: _Like | None = None, -) -> _nt.Array: ... +) -> _nt.Array2D: ... # @overload -def diag(v: _ArrayNoD[_ScalarT], k: int = 0) -> _nt.Array[_ScalarT]: ... # type: ignore[overload-overlap] +def diag(v: _ArrayNoD[_ScalarT], k: int = 0) -> _nt.Array[_ScalarT]: ... # type: ignore[overload-overlap] # false positive @overload def diag(v: _nt.Array2D[_ScalarT] | Sequence[Sequence[_ScalarT]], k: int = 0) -> _nt.Array1D[_ScalarT]: ... @overload @@ -126,7 +126,7 @@ def diag(v: _nt._ToArray_nd[_ScalarT], k: int = 0) -> _nt.Array[_ScalarT]: ... @overload def diag(v: _nt.ToGeneric_nd, k: int = 0) -> _nt.Array: ... -# +# keep in sync with `numpy.ma.extras.diagflat` @overload def diagflat(v: _nt._ToArray_nd[_ScalarT], k: int = 0) -> _nt.Array2D[_ScalarT]: ... @overload