🚨 fix PYI042 errors in numpy-stubs

Author: jorenham

src/numpy-stubs/__init__.pyi

@@ -189,6 +189,12 @@ _TimeLike: TypeAlias = np.datetime64 | np.timedelta64
 _SupportsStringLikeArray: TypeAlias = _SupportsArray[np.dtypes.StringDType | np.dtype[np.character]]
 _ToCharStringND: TypeAlias = _nt.SequenceND[_SupportsStringLikeArray | list[str] | list[bytes] | list[str | bytes]]
 
+_Eq1: TypeAlias = L[1, True]
+_Eq2: TypeAlias = L[2]
+_Ge3 = TypeAliasType("_Ge3", L[3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16])
+_Ge1: TypeAlias = _Eq1 | _Ge2
+_Ge2: TypeAlias = _Eq2 | _Ge3
+
 ###
 # helper protocols
 
@@ -2109,12 +2115,6 @@ class _Call1N2N_py(Protocol[_OutT_co]):
         **kwargs: Unpack[_Kwargs3_],
     ) -> Incomplete: ...
 
-_3P = TypeAliasType("_3P", L[3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16])
-_2: TypeAlias = L[2]
-_2P: TypeAlias = _2 | _3P
-_1: TypeAlias = L[True, 1]
-_1P: TypeAlias = _1 | _2P
-
 _pyfunc_1_1 = TypeAliasType(
     "_pyfunc_1_1",
     np.ufunc[_Call11_py[_OutT], _At1, _ReduceE, _ReduceAtE, _AccumulateE, _OuterE],
@@ -2143,20 +2143,22 @@ _pyfunc_1n_2n = TypeAliasType(
 
 # NOTE: We can't use e.g. `Concatenate[Any, ...]`, as that causes mypy to reject every function...
 @overload  # (a) -> T
-def frompyfunc(f: Callable[[Incomplete], _T], /, nin: _1, nout: _1, *, identity: object = None) -> _pyfunc_1_1[_T]: ...
+def frompyfunc(
+    f: Callable[[Incomplete], _T], /, nin: _Eq1, nout: _Eq1, *, identity: object = None
+) -> _pyfunc_1_1[_T]: ...
 @overload  # (a, b) -> T
 def frompyfunc(
-    f: Callable[[Incomplete, Incomplete], _T], /, nin: _2, nout: _1, *, identity: object = None
+    f: Callable[[Incomplete, Incomplete], _T], /, nin: _Eq2, nout: _Eq1, *, identity: object = None
 ) -> _pyfunc_2_1[_T]: ...
 @overload  # (a, b, c, ...) -> T
-def frompyfunc(f: Callable[..., _T], /, nin: _3P, nout: _1, *, identity: object = None) -> _pyfunc_3n_1[_T]: ...
+def frompyfunc(f: Callable[..., _T], /, nin: _Ge3, nout: _Eq1, *, identity: object = None) -> _pyfunc_3n_1[_T]: ...
 @overload  # (a, ...) -> (T1, T2)
 def frompyfunc(  # type: ignore[overload-overlap]  # mypy-only false positive
-    f: Callable[..., tuple[_T1, _T2]], /, nin: _1P, nout: _2, *, identity: object = None
+    f: Callable[..., tuple[_T1, _T2]], /, nin: _Ge1, nout: _Eq2, *, identity: object = None
 ) -> _pyfunc_1n_2[_T1, _T2]: ...
 @overload  # (a, ...) -> (T1, T2, *(T, ...))
 def frompyfunc(
-    f: Callable[..., tuple[_T1, _T2, *tuple[_T, ...]]], /, nin: _1P, nout: _2P, *, identity: object = None
+    f: Callable[..., tuple[_T1, _T2, *tuple[_T, ...]]], /, nin: _Ge1, nout: _Ge2, *, identity: object = None
 ) -> _pyfunc_1n_2n[_T1 | _T2 | _T]: ...
 @overload
 def frompyfunc(

src/numpy-stubs/_core/umath.pyi

@@ -139,9 +139,9 @@ class _NBit(Generic[_DataSize_co, _ItemSize_co]):
 @type_check_only
 class _8Bit(_NoOrder, _NBit[L[1], L[1]]): ...
 
-_16Bit: TypeAlias = _NBit[L[2], L[2]]
-_32Bit: TypeAlias = _NBit[L[4], L[4]]
-_64Bit: TypeAlias = _NBit[L[8], L[8]]
+_16Bit: TypeAlias = _NBit[L[2], L[2]]  # noqa: PYI042
+_32Bit: TypeAlias = _NBit[L[4], L[4]]  # noqa: PYI042
+_64Bit: TypeAlias = _NBit[L[8], L[8]]  # noqa: PYI042
 
 if sys.platform == "win32":
     _LongSize: TypeAlias = L[4]  # pyright: ignore[reportRedeclaration]

src/numpy-stubs/dtypes.pyi

@@ -76,7 +76,7 @@ _ScalarT1 = TypeVar("_ScalarT1", bound=np.generic)
 _ScalarT2 = TypeVar("_ScalarT2", bound=np.generic)
 _NumberT = TypeVar("_NumberT", bound=np.number)
 
-_2Tuple: TypeAlias = tuple[_T, _T]
+_Tuple2: TypeAlias = tuple[_T, _T]
 _ToInt: TypeAlias = CanIndex | SupportsInt
 _PercentileMethod: TypeAlias = L[
     "inverted_cdf",
@@ -168,7 +168,7 @@ def average(
     returned: L[True],
     *,
     keepdims: _NoValueType = ...,
-) -> _2Tuple[np.float64]: ...
+) -> _Tuple2[np.float64]: ...
 @overload
 def average(
     a: _nt.ToFloat64_nd | _nt.CoInteger_nd,
@@ -177,7 +177,7 @@ def average(
     *,
     returned: L[True],
     keepdims: _NoValueType | L[False] = ...,
-) -> _2Tuple[np.float64]: ...
+) -> _Tuple2[np.float64]: ...
 @overload
 def average(
     a: _nt.CoFloating_nd,
@@ -195,7 +195,7 @@ def average(
     returned: L[True],
     *,
     keepdims: _NoValueType | L[False] = ...,
-) -> _2Tuple[np.floating]: ...
+) -> _Tuple2[np.floating]: ...
 @overload
 def average(
     a: _nt.CoFloating_nd,
@@ -204,7 +204,7 @@ def average(
     *,
     returned: L[True],
     keepdims: _NoValueType | L[False] = ...,
-) -> _2Tuple[np.floating]: ...
+) -> _Tuple2[np.floating]: ...
 @overload
 def average(
     a: _nt.ToComplex_nd,
@@ -240,7 +240,7 @@ def average(
     returned: L[True],
     *,
     keepdims: _NoValueType | L[False] = ...,
-) -> _2Tuple[np.complexfloating]: ...
+) -> _Tuple2[np.complexfloating]: ...
 @overload
 def average(
     a: _nt.CoComplex_nd,
@@ -249,7 +249,7 @@ def average(
     returned: L[True],
     *,
     keepdims: _NoValueType | L[False] = ...,
-) -> _2Tuple[np.complexfloating]: ...
+) -> _Tuple2[np.complexfloating]: ...
 @overload
 def average(
     a: _nt.ToComplex_nd,
@@ -258,7 +258,7 @@ def average(
     *,
     returned: L[True],
     keepdims: _NoValueType | L[False] = ...,
-) -> _2Tuple[np.complexfloating]: ...
+) -> _Tuple2[np.complexfloating]: ...
 @overload
 def average(
     a: _nt.CoComplex_nd,
@@ -267,7 +267,7 @@ def average(
     weights: _nt.ToComplex_nd,
     returned: L[True],
     keepdims: _NoValueType | L[False] = ...,
-) -> _2Tuple[np.complexfloating]: ...
+) -> _Tuple2[np.complexfloating]: ...
 @overload
 def average(
     a: _nt.CoComplex_nd | _nt.ToObject_nd,
@@ -285,7 +285,7 @@ def average(
     returned: L[True],
     *,
     keepdims: _NoValueType | bool = ...,
-) -> _2Tuple[Incomplete]: ...
+) -> _Tuple2[Incomplete]: ...
 @overload
 def average(
     a: _nt.CoComplex_nd | _nt.ToObject_nd,
@@ -294,7 +294,7 @@ def average(
     *,
     returned: L[True],
     keepdims: _NoValueType | bool = ...,
-) -> _2Tuple[Incomplete]: ...
+) -> _Tuple2[Incomplete]: ...
 
 #
 @overload

src/numpy-stubs/lib/_function_base_impl.pyi

@@ -88,10 +88,10 @@ _AnyNumberT = TypeVar(
 _False: TypeAlias = L[False]
 _True: TypeAlias = L[True]
 
-_2Tuple: TypeAlias = tuple[_T, _T]
+_Tuple2: TypeAlias = tuple[_T, _T]
 _ToInt: TypeAlias = SupportsInt | CanIndex
 
-_Ax2: TypeAlias = _ToInt | _2Tuple[_ToInt]
+_Ax2: TypeAlias = _ToInt | _Tuple2[_ToInt]
 _Axes: TypeAlias = Iterable[int]
 
 _Ord: TypeAlias = L[1, -1, 2, -2, "fro", "nuc"] | float
@@ -571,31 +571,31 @@ def eigvalsh(a: _nt.CoComplex128_1nd, UPLO: _UPLO = "L") -> _nt.Array[np.floatin
 @overload  # float64, reduced|complete
 def qr(a: _ToFloat64_1nd, mode: L["reduced", "complete"] = "reduced") -> QRResult[np.float64]: ...
 @overload  # float64, raw
-def qr(a: _ToFloat64_1nd, mode: L["raw"]) -> _2Tuple[_Array2ND[np.float64]]: ...
+def qr(a: _ToFloat64_1nd, mode: L["raw"]) -> _Tuple2[_Array2ND[np.float64]]: ...
 @overload  # float64, r
 def qr(a: _ToFloat64_1nd, mode: L["r"]) -> _Array2ND[np.float64]: ...
 @overload  # complex128, reduced|complete
 def qr(a: _nt.ToComplex128_1nd, mode: L["reduced", "complete"] = "reduced") -> QRResult[np.complex128]: ...
 @overload  # complex128, raw
-def qr(a: _nt.ToComplex128_1nd, mode: L["raw"]) -> _2Tuple[_Array2ND[np.complex128]]: ...
+def qr(a: _nt.ToComplex128_1nd, mode: L["raw"]) -> _Tuple2[_Array2ND[np.complex128]]: ...
 @overload  # complex128, r
 def qr(a: _nt.ToComplex128_1nd, mode: L["r"]) -> _Array2ND[np.complex128]: ...
 @overload  # float32, reduced|complete
 def qr(a: _nt.ToFloat32_1nd, mode: L["reduced", "complete"] = "reduced") -> QRResult[np.float32]: ...
 @overload  # float32, raw
-def qr(a: _nt.ToFloat32_1nd, mode: L["raw"]) -> _2Tuple[_Array2ND[np.float32]]: ...
+def qr(a: _nt.ToFloat32_1nd, mode: L["raw"]) -> _Tuple2[_Array2ND[np.float32]]: ...
 @overload  # float32, r
 def qr(a: _nt.ToFloat32_1nd, mode: L["r"]) -> _Array2ND[np.float32]: ...
 @overload  # complex64, reduced|complete
 def qr(a: _nt.ToComplex64_1nd, mode: L["reduced", "complete"] = "reduced") -> QRResult[np.complex64]: ...
 @overload  # complex64, raw
-def qr(a: _nt.ToComplex64_1nd, mode: L["raw"]) -> _2Tuple[_Array2ND[np.complex64]]: ...
+def qr(a: _nt.ToComplex64_1nd, mode: L["raw"]) -> _Tuple2[_Array2ND[np.complex64]]: ...
 @overload  # complex64, r
 def qr(a: _nt.ToComplex64_1nd, mode: L["r"]) -> _Array2ND[np.complex64]: ...
 @overload  # +complex128, reduced|complete
 def qr(a: _nt.CoComplex128_1nd, mode: L["reduced", "complete"] = "reduced") -> QRResult[np.inexact]: ...
 @overload  # +complex128, raw
-def qr(a: _nt.CoComplex128_1nd, mode: L["raw"]) -> _2Tuple[_Array2ND[np.inexact]]: ...
+def qr(a: _nt.CoComplex128_1nd, mode: L["raw"]) -> _Tuple2[_Array2ND[np.inexact]]: ...
 @overload  # +complex128, r
 def qr(a: _nt.CoComplex128_1nd, mode: L["r"]) -> _Array2ND[np.inexact]: ...
 

src/numpy-stubs/linalg/_linalg.pyi

@@ -26,6 +26,9 @@ _ArrayT2 = TypeVar("_ArrayT2", bound=_nt.Array)
 _CallT11G = TypeVar("_CallT11G", bound=Callable[Concatenate[Any, ...], object], default=_Call11)
 _CallT12G = TypeVar("_CallT12G", bound=Callable[Concatenate[Any, ...], object], default=_Call12)
 
+_GUFunc1: TypeAlias = np.ufunc[_CallT11G, _AtE, _ReduceE, _ReduceAtE, _AccumulateE, _OuterE]
+_GUFunc2: TypeAlias = np.ufunc[_CallT12G, _AtE, _ReduceE, _ReduceAtE, _AccumulateE, _OuterE]
+
 @type_check_only
 class _Kwargs2(_KwargsCommon, total=False):
     signature: _Tuple2[DTypeLike] | str | None
@@ -148,34 +151,31 @@ class _Call12(Protocol):
         **kwds: Unpack[_Kwargs3],
     ) -> tuple[_ArrayT1, _ArrayT2]: ...
 
-_gufunc_1_1: TypeAlias = np.ufunc[_CallT11G, _AtE, _ReduceE, _ReduceAtE, _AccumulateE, _OuterE]
-_gufunc_1_2: TypeAlias = np.ufunc[_CallT12G, _AtE, _ReduceE, _ReduceAtE, _AccumulateE, _OuterE]
-
 ###
 
 __version__: Final[str] = ...
 _ilp64: Final[bool] = ...
 
 # (m,m) -> ()
-det: Final[_gufunc_1_1] = ...
+det: Final[_GUFunc1] = ...
 # (m,m) -> (m)
-cholesky_lo: Final[_gufunc_1_1] = ...
-cholesky_up: Final[_gufunc_1_1] = ...
-eigvals: Final[_gufunc_1_1] = ...
-eigvalsh_lo: Final[_gufunc_1_1] = ...
-eigvalsh_up: Final[_gufunc_1_1] = ...
+cholesky_lo: Final[_GUFunc1] = ...
+cholesky_up: Final[_GUFunc1] = ...
+eigvals: Final[_GUFunc1] = ...
+eigvalsh_lo: Final[_GUFunc1] = ...
+eigvalsh_up: Final[_GUFunc1] = ...
 # (m,m) -> (m,m)
-inv: Final[_gufunc_1_1] = ...
+inv: Final[_GUFunc1] = ...
 # (m,n) -> (p)
-qr_r_raw: Final[_gufunc_1_1] = ...
-svd: Final[_gufunc_1_1] = ...
+qr_r_raw: Final[_GUFunc1] = ...
+svd: Final[_GUFunc1] = ...
 
 # (m,m) -> (), ()
-slogdet: Final[_gufunc_1_2] = ...
+slogdet: Final[_GUFunc2] = ...
 # (m,m) -> (m), (m,m)
-eig: Final[_gufunc_1_2] = ...
-eigh_lo: Final[_gufunc_1_2] = ...
-eigh_up: Final[_gufunc_1_2] = ...
+eig: Final[_GUFunc2] = ...
+eigh_lo: Final[_GUFunc2] = ...
+eigh_up: Final[_GUFunc2] = ...
 
 # (m,n), (n) -> (m,m)
 qr_complete: Final[_gufunc_2_1] = ...