Skip to content

Commit ce1085d

Browse files
jorenhamjorenham
committed
🚨 fix PYI042 errors in numpy-stubs 
1 parent da0ba80 commit ce1085d

File tree

8 files changed

+336
-334
lines changed

8 files changed

+336
-334
lines changed

‎src/numpy-stubs/__init__.pyi

Lines changed: 68 additions & 68 deletions
Large diffs are not rendered by default.

‎src/numpy-stubs/_core/umath.pyi

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,12 @@ _TimeLike: TypeAlias = np.datetime64 | np.timedelta64
189189
_SupportsStringLikeArray: TypeAlias = _SupportsArray[np.dtypes.StringDType | np.dtype[np.character]]
190190
_ToCharStringND: TypeAlias = _nt.SequenceND[_SupportsStringLikeArray | list[str] | list[bytes] | list[str | bytes]]
191191

192+
_Eq1: TypeAlias = L[1, True]
193+
_Eq2: TypeAlias = L[2]
194+
_Ge3 = TypeAliasType("_Ge3", L[3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16])
195+
_Ge1: TypeAlias = _Eq1 | _Ge2
196+
_Ge2: TypeAlias = _Eq2 | _Ge3
197+
192198
###
193199
# helper protocols
194200

@@ -2109,12 +2115,6 @@ class _Call1N2N_py(Protocol[_OutT_co]):
21092115
**kwargs: Unpack[_Kwargs3_],
21102116
) -> Incomplete: ...
21112117

2112-
_3P = TypeAliasType("_3P", L[3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16])
2113-
_2: TypeAlias = L[2]
2114-
_2P: TypeAlias = _2 | _3P
2115-
_1: TypeAlias = L[True, 1]
2116-
_1P: TypeAlias = _1 | _2P
2117-
21182118
_pyfunc_1_1 = TypeAliasType(
21192119
"_pyfunc_1_1",
21202120
np.ufunc[_Call11_py[_OutT], _At1, _ReduceE, _ReduceAtE, _AccumulateE, _OuterE],
@@ -2143,20 +2143,22 @@ _pyfunc_1n_2n = TypeAliasType(
21432143

21442144
# NOTE: We can't use e.g. `Concatenate[Any, ...]`, as that causes mypy to reject every function...
21452145
@overload # (a) -> T
2146-
def frompyfunc(f: Callable[[Incomplete], _T], /, nin: _1, nout: _1, *, identity: object = None) -> _pyfunc_1_1[_T]: ...
2146+
def frompyfunc(
2147+
f: Callable[[Incomplete], _T], /, nin: _Eq1, nout: _Eq1, *, identity: object = None
2148+
) -> _pyfunc_1_1[_T]: ...
21472149
@overload # (a, b) -> T
21482150
def frompyfunc(
2149-
f: Callable[[Incomplete, Incomplete], _T], /, nin: _2, nout: _1, *, identity: object = None
2151+
f: Callable[[Incomplete, Incomplete], _T], /, nin: _Eq2, nout: _Eq1, *, identity: object = None
21502152
) -> _pyfunc_2_1[_T]: ...
21512153
@overload # (a, b, c, ...) -> T
2152-
def frompyfunc(f: Callable[..., _T], /, nin: _3P, nout: _1, *, identity: object = None) -> _pyfunc_3n_1[_T]: ...
2154+
def frompyfunc(f: Callable[..., _T], /, nin: _Ge3, nout: _Eq1, *, identity: object = None) -> _pyfunc_3n_1[_T]: ...
21532155
@overload # (a, ...) -> (T1, T2)
21542156
def frompyfunc( # type: ignore[overload-overlap] # mypy-only false positive
2155-
f: Callable[..., tuple[_T1, _T2]], /, nin: _1P, nout: _2, *, identity: object = None
2157+
f: Callable[..., tuple[_T1, _T2]], /, nin: _Ge1, nout: _Eq2, *, identity: object = None
21562158
) -> _pyfunc_1n_2[_T1, _T2]: ...
21572159
@overload # (a, ...) -> (T1, T2, *(T, ...))
21582160
def frompyfunc(
2159-
f: Callable[..., tuple[_T1, _T2, *tuple[_T, ...]]], /, nin: _1P, nout: _2P, *, identity: object = None
2161+
f: Callable[..., tuple[_T1, _T2, *tuple[_T, ...]]], /, nin: _Ge1, nout: _Ge2, *, identity: object = None
21602162
) -> _pyfunc_1n_2n[_T1 | _T2 | _T]: ...
21612163
@overload
21622164
def frompyfunc(

‎src/numpy-stubs/dtypes.pyi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ class _NBit(Generic[_DataSize_co, _ItemSize_co]):
139139
@type_check_only
140140
class _8Bit(_NoOrder, _NBit[L[1], L[1]]): ...
141141

142-
_16Bit: TypeAlias = _NBit[L[2], L[2]]
143-
_32Bit: TypeAlias = _NBit[L[4], L[4]]
144-
_64Bit: TypeAlias = _NBit[L[8], L[8]]
142+
_16Bit: TypeAlias = _NBit[L[2], L[2]] # noqa: PYI042
143+
_32Bit: TypeAlias = _NBit[L[4], L[4]] # noqa: PYI042
144+
_64Bit: TypeAlias = _NBit[L[8], L[8]] # noqa: PYI042
145145

146146
if sys.platform == "win32":
147147
_LongSize: TypeAlias = L[4] # pyright: ignore[reportRedeclaration]

‎src/numpy-stubs/lib/_function_base_impl.pyi

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ _ScalarT1 = TypeVar("_ScalarT1", bound=np.generic)
7676
_ScalarT2 = TypeVar("_ScalarT2", bound=np.generic)
7777
_NumberT = TypeVar("_NumberT", bound=np.number)
7878

79-
_2Tuple: TypeAlias = tuple[_T, _T]
79+
_Tuple2: TypeAlias = tuple[_T, _T]
8080
_ToInt: TypeAlias = CanIndex | SupportsInt
8181
_PercentileMethod: TypeAlias = L[
8282
"inverted_cdf",
@@ -168,7 +168,7 @@ def average(
168168
returned: L[True],
169169
*,
170170
keepdims: _NoValueType = ...,
171-
) -> _2Tuple[np.float64]: ...
171+
) -> _Tuple2[np.float64]: ...
172172
@overload
173173
def average(
174174
a: _nt.ToFloat64_nd | _nt.CoInteger_nd,
@@ -177,7 +177,7 @@ def average(
177177
*,
178178
returned: L[True],
179179
keepdims: _NoValueType | L[False] = ...,
180-
) -> _2Tuple[np.float64]: ...
180+
) -> _Tuple2[np.float64]: ...
181181
@overload
182182
def average(
183183
a: _nt.CoFloating_nd,
@@ -195,7 +195,7 @@ def average(
195195
returned: L[True],
196196
*,
197197
keepdims: _NoValueType | L[False] = ...,
198-
) -> _2Tuple[np.floating]: ...
198+
) -> _Tuple2[np.floating]: ...
199199
@overload
200200
def average(
201201
a: _nt.CoFloating_nd,
@@ -204,7 +204,7 @@ def average(
204204
*,
205205
returned: L[True],
206206
keepdims: _NoValueType | L[False] = ...,
207-
) -> _2Tuple[np.floating]: ...
207+
) -> _Tuple2[np.floating]: ...
208208
@overload
209209
def average(
210210
a: _nt.ToComplex_nd,
@@ -240,7 +240,7 @@ def average(
240240
returned: L[True],
241241
*,
242242
keepdims: _NoValueType | L[False] = ...,
243-
) -> _2Tuple[np.complexfloating]: ...
243+
) -> _Tuple2[np.complexfloating]: ...
244244
@overload
245245
def average(
246246
a: _nt.CoComplex_nd,
@@ -249,7 +249,7 @@ def average(
249249
returned: L[True],
250250
*,
251251
keepdims: _NoValueType | L[False] = ...,
252-
) -> _2Tuple[np.complexfloating]: ...
252+
) -> _Tuple2[np.complexfloating]: ...
253253
@overload
254254
def average(
255255
a: _nt.ToComplex_nd,
@@ -258,7 +258,7 @@ def average(
258258
*,
259259
returned: L[True],
260260
keepdims: _NoValueType | L[False] = ...,
261-
) -> _2Tuple[np.complexfloating]: ...
261+
) -> _Tuple2[np.complexfloating]: ...
262262
@overload
263263
def average(
264264
a: _nt.CoComplex_nd,
@@ -267,7 +267,7 @@ def average(
267267
weights: _nt.ToComplex_nd,
268268
returned: L[True],
269269
keepdims: _NoValueType | L[False] = ...,
270-
) -> _2Tuple[np.complexfloating]: ...
270+
) -> _Tuple2[np.complexfloating]: ...
271271
@overload
272272
def average(
273273
a: _nt.CoComplex_nd | _nt.ToObject_nd,
@@ -285,7 +285,7 @@ def average(
285285
returned: L[True],
286286
*,
287287
keepdims: _NoValueType | bool = ...,
288-
) -> _2Tuple[Incomplete]: ...
288+
) -> _Tuple2[Incomplete]: ...
289289
@overload
290290
def average(
291291
a: _nt.CoComplex_nd | _nt.ToObject_nd,
@@ -294,7 +294,7 @@ def average(
294294
*,
295295
returned: L[True],
296296
keepdims: _NoValueType | bool = ...,
297-
) -> _2Tuple[Incomplete]: ...
297+
) -> _Tuple2[Incomplete]: ...
298298

299299
#
300300
@overload

‎src/numpy-stubs/linalg/_linalg.pyi

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ _AnyNumberT = TypeVar(
8888
_False: TypeAlias = L[False]
8989
_True: TypeAlias = L[True]
9090

91-
_2Tuple: TypeAlias = tuple[_T, _T]
91+
_Tuple2: TypeAlias = tuple[_T, _T]
9292
_ToInt: TypeAlias = SupportsInt | CanIndex
9393

94-
_Ax2: TypeAlias = _ToInt | _2Tuple[_ToInt]
94+
_Ax2: TypeAlias = _ToInt | _Tuple2[_ToInt]
9595
_Axes: TypeAlias = Iterable[int]
9696

9797
_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
571571
@overload # float64, reduced|complete
572572
def qr(a: _ToFloat64_1nd, mode: L["reduced", "complete"] = "reduced") -> QRResult[np.float64]: ...
573573
@overload # float64, raw
574-
def qr(a: _ToFloat64_1nd, mode: L["raw"]) -> _2Tuple[_Array2ND[np.float64]]: ...
574+
def qr(a: _ToFloat64_1nd, mode: L["raw"]) -> _Tuple2[_Array2ND[np.float64]]: ...
575575
@overload # float64, r
576576
def qr(a: _ToFloat64_1nd, mode: L["r"]) -> _Array2ND[np.float64]: ...
577577
@overload # complex128, reduced|complete
578578
def qr(a: _nt.ToComplex128_1nd, mode: L["reduced", "complete"] = "reduced") -> QRResult[np.complex128]: ...
579579
@overload # complex128, raw
580-
def qr(a: _nt.ToComplex128_1nd, mode: L["raw"]) -> _2Tuple[_Array2ND[np.complex128]]: ...
580+
def qr(a: _nt.ToComplex128_1nd, mode: L["raw"]) -> _Tuple2[_Array2ND[np.complex128]]: ...
581581
@overload # complex128, r
582582
def qr(a: _nt.ToComplex128_1nd, mode: L["r"]) -> _Array2ND[np.complex128]: ...
583583
@overload # float32, reduced|complete
584584
def qr(a: _nt.ToFloat32_1nd, mode: L["reduced", "complete"] = "reduced") -> QRResult[np.float32]: ...
585585
@overload # float32, raw
586-
def qr(a: _nt.ToFloat32_1nd, mode: L["raw"]) -> _2Tuple[_Array2ND[np.float32]]: ...
586+
def qr(a: _nt.ToFloat32_1nd, mode: L["raw"]) -> _Tuple2[_Array2ND[np.float32]]: ...
587587
@overload # float32, r
588588
def qr(a: _nt.ToFloat32_1nd, mode: L["r"]) -> _Array2ND[np.float32]: ...
589589
@overload # complex64, reduced|complete
590590
def qr(a: _nt.ToComplex64_1nd, mode: L["reduced", "complete"] = "reduced") -> QRResult[np.complex64]: ...
591591
@overload # complex64, raw
592-
def qr(a: _nt.ToComplex64_1nd, mode: L["raw"]) -> _2Tuple[_Array2ND[np.complex64]]: ...
592+
def qr(a: _nt.ToComplex64_1nd, mode: L["raw"]) -> _Tuple2[_Array2ND[np.complex64]]: ...
593593
@overload # complex64, r
594594
def qr(a: _nt.ToComplex64_1nd, mode: L["r"]) -> _Array2ND[np.complex64]: ...
595595
@overload # +complex128, reduced|complete
596596
def qr(a: _nt.CoComplex128_1nd, mode: L["reduced", "complete"] = "reduced") -> QRResult[np.inexact]: ...
597597
@overload # +complex128, raw
598-
def qr(a: _nt.CoComplex128_1nd, mode: L["raw"]) -> _2Tuple[_Array2ND[np.inexact]]: ...
598+
def qr(a: _nt.CoComplex128_1nd, mode: L["raw"]) -> _Tuple2[_Array2ND[np.inexact]]: ...
599599
@overload # +complex128, r
600600
def qr(a: _nt.CoComplex128_1nd, mode: L["r"]) -> _Array2ND[np.inexact]: ...
601601

‎src/numpy-stubs/linalg/_umath_linalg.pyi

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ _ArrayT2 = TypeVar("_ArrayT2", bound=_nt.Array)
2626
_CallT11G = TypeVar("_CallT11G", bound=Callable[Concatenate[Any, ...], object], default=_Call11)
2727
_CallT12G = TypeVar("_CallT12G", bound=Callable[Concatenate[Any, ...], object], default=_Call12)
2828

29+
_GUFunc1: TypeAlias = np.ufunc[_CallT11G, _AtE, _ReduceE, _ReduceAtE, _AccumulateE, _OuterE]
30+
_GUFunc2: TypeAlias = np.ufunc[_CallT12G, _AtE, _ReduceE, _ReduceAtE, _AccumulateE, _OuterE]
31+
2932
@type_check_only
3033
class _Kwargs2(_KwargsCommon, total=False):
3134
signature: _Tuple2[DTypeLike] | str | None
@@ -148,34 +151,31 @@ class _Call12(Protocol):
148151
**kwds: Unpack[_Kwargs3],
149152
) -> tuple[_ArrayT1, _ArrayT2]: ...
150153

151-
_gufunc_1_1: TypeAlias = np.ufunc[_CallT11G, _AtE, _ReduceE, _ReduceAtE, _AccumulateE, _OuterE]
152-
_gufunc_1_2: TypeAlias = np.ufunc[_CallT12G, _AtE, _ReduceE, _ReduceAtE, _AccumulateE, _OuterE]
153-
154154
###
155155

156156
__version__: Final[str] = ...
157157
_ilp64: Final[bool] = ...
158158

159159
# (m,m) -> ()
160-
det: Final[_gufunc_1_1] = ...
160+
det: Final[_GUFunc1] = ...
161161
# (m,m) -> (m)
162-
cholesky_lo: Final[_gufunc_1_1] = ...
163-
cholesky_up: Final[_gufunc_1_1] = ...
164-
eigvals: Final[_gufunc_1_1] = ...
165-
eigvalsh_lo: Final[_gufunc_1_1] = ...
166-
eigvalsh_up: Final[_gufunc_1_1] = ...
162+
cholesky_lo: Final[_GUFunc1] = ...
163+
cholesky_up: Final[_GUFunc1] = ...
164+
eigvals: Final[_GUFunc1] = ...
165+
eigvalsh_lo: Final[_GUFunc1] = ...
166+
eigvalsh_up: Final[_GUFunc1] = ...
167167
# (m,m) -> (m,m)
168-
inv: Final[_gufunc_1_1] = ...
168+
inv: Final[_GUFunc1] = ...
169169
# (m,n) -> (p)
170-
qr_r_raw: Final[_gufunc_1_1] = ...
171-
svd: Final[_gufunc_1_1] = ...
170+
qr_r_raw: Final[_GUFunc1] = ...
171+
svd: Final[_GUFunc1] = ...
172172

173173
# (m,m) -> (), ()
174-
slogdet: Final[_gufunc_1_2] = ...
174+
slogdet: Final[_GUFunc2] = ...
175175
# (m,m) -> (m), (m,m)
176-
eig: Final[_gufunc_1_2] = ...
177-
eigh_lo: Final[_gufunc_1_2] = ...
178-
eigh_up: Final[_gufunc_1_2] = ...
176+
eig: Final[_GUFunc2] = ...
177+
eigh_lo: Final[_GUFunc2] = ...
178+
eigh_up: Final[_GUFunc2] = ...
179179

180180
# (m,n), (n) -> (m,m)
181181
qr_complete: Final[_gufunc_2_1] = ...

0 commit comments

Comments
 (0)