🚨 fix PYI047 errors in numpy-stubs

jorenham · jorenham · commit da0ba80d5cdc · 2025-05-20T01:36:53.000+02:00
diff --git a/src/numpy-stubs/__init__.pyi b/src/numpy-stubs/__init__.pyi
@@ -7,8 +7,6 @@ import sys
 from _typeshed import Incomplete, StrOrBytesPath, SupportsFlush, SupportsLenAndGetItem, SupportsWrite
 from builtins import bool as py_bool
 from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence
-from decimal import Decimal
-from fractions import Fraction
 from types import EllipsisType, GenericAlias, GetSetDescriptorType, MappingProxyType, ModuleType
 from typing import (
     Any,
@@ -694,64 +692,6 @@ _SubModule: TypeAlias = L[
     "testing",
     "typing",
 ]
-_ExpiredAttribute: TypeAlias = L[
-    "DataSource",
-    "Inf",
-    "Infinity",
-    "NINF",
-    "NZERO",
-    "NaN",
-    "PINF",
-    "PZERO",
-    "add_docstring",
-    "add_newdoc",
-    "add_newdoc_ufunc",
-    "alltrue",
-    "asfarray",
-    "byte_bounds",
-    "cast",
-    "cfloat",
-    "clongfloat",
-    "compare_chararrays",
-    "compat",
-    "complex_",
-    "deprecate",
-    "deprecate_with_doc",
-    "disp",
-    "fastCopyAndTranspose",
-    "find_common_type",
-    "float_",
-    "format_parser",
-    "get_array_wrap",
-    "geterrobj",
-    "infty",
-    "issctype",
-    "issubclass_",
-    "issubsctype",
-    "longcomplex",
-    "longfloat",
-    "lookfor",
-    "mat",
-    "maximum_sctype",
-    "nbytes",
-    "obj2sctype",
-    "recfromcsv",
-    "recfromtxt",
-    "round_",
-    "safe_eval",
-    "sctype2char",
-    "sctypes",
-    "set_numeric_ops",
-    "set_string_function",
-    "seterrobj",
-    "singlecomplex",
-    "sometrue",
-    "source",
-    "string_",
-    "tracemalloc_domain",
-    "unicode_",
-    "who",
-]
 _UFuncMethod: TypeAlias = L["__call__", "reduce", "reduceat", "accumulate", "outer", "at"]
 
 _2Tuple: TypeAlias = tuple[_T, _T]
@@ -769,12 +709,10 @@ _JustBuiltinScalar: TypeAlias = int | _nt.JustFloat | _nt.JustComplex | _nt.Just
 
 _AbstractInexact: TypeAlias = _JustInexact | _JustFloating | _JustComplexFloating
 _AbstractInteger: TypeAlias = _JustInteger | _JustSignedInteger | _JustUnsignedInteger
-_AbstractNumber: TypeAlias = _JustNumber | _AbstractInteger | _AbstractInexact
 
 _int32_min: TypeAlias = int32 | int64
 _int16_min: TypeAlias = int16 | _int32_min
 _int16_max: TypeAlias = int16 | int8
-_int32_max: TypeAlias = int32 | _int16_max
 _float32_min: TypeAlias = float32 | float64 | longdouble
 _float32_max: TypeAlias = float32 | float16
 _float64_max: TypeAlias = float64 | _float32_max
@@ -784,12 +722,7 @@ _integer32_min: TypeAlias = _nt.integer32 | _nt.integer64
 _inexact64_min: TypeAlias = _nt.inexact64 | _nt.inexact64l
 _inexact64_max: TypeAlias = _float64_max | _complex128_max
 
-_ArrayUInt_co: TypeAlias = _nt.Array[_nt.co_uint64]
-_ArrayInt_co: TypeAlias = _nt.Array[_nt.co_int64]
 _ArrayInteger_co: TypeAlias = _nt.Array[_nt.co_integer]
-_ArrayFloat64_co: TypeAlias = _nt.Array[_nt.co_float64]
-_ArrayFloat_co: TypeAlias = _nt.Array[_nt.co_float]
-_ArrayComplex128_co: TypeAlias = _nt.Array[_nt.co_complex128]
 _ArrayComplex_co: TypeAlias = _nt.Array[_nt.co_complex]
 _ArrayTD64_co: TypeAlias = _nt.Array[_nt.co_timedelta]
 
@@ -798,21 +731,6 @@ _ToIndices: TypeAlias = _ToIndex | tuple[_ToIndex, ...]
 
 _Axis0D: TypeAlias = L[0, -1] | tuple[()]
 
-_UnsignedIntegerCType: TypeAlias = type[
-    ct.c_uint8 | ct.c_uint16 | ct.c_uint32 | ct.c_uint64
-    | ct.c_ushort | ct.c_uint | ct.c_ulong | ct.c_ulonglong
-    | ct.c_size_t | ct.c_void_p
-]  # fmt: skip
-_SignedIntegerCType: TypeAlias = type[
-    ct.c_int8 | ct.c_int16 | ct.c_int32 | ct.c_int64
-    | ct.c_short | ct.c_int | ct.c_long | ct.c_longlong
-    | ct.c_ssize_t
-]  # fmt: skip
-_FloatingCType: TypeAlias = type[ct.c_float | ct.c_double | ct.c_longdouble]
-_IntegerCType: TypeAlias = _UnsignedIntegerCType | _SignedIntegerCType
-_NumberCType: TypeAlias = _IntegerCType
-_GenericCType: TypeAlias = _NumberCType | type[ct.c_bool | ct.c_char | ct.py_object[Any]]
-
 _PyBoolND: TypeAlias = _nt.SequenceND[py_bool]
 _PyCoIntND: TypeAlias = _nt.SequenceND[int]
 _PyCoFloatND: TypeAlias = _nt.SequenceND[float]
@@ -821,11 +739,6 @@ _PyIntND: TypeAlias = _nt.SequenceND[_nt.JustInt]
 _PyFloatND: TypeAlias = _nt.SequenceND[_nt.JustFloat]
 _PyComplexND: TypeAlias = _nt.SequenceND[_nt.JustComplex]
 
-# some commonly used builtin types that are known to result in a
-# `dtype[object_]`, when their *type* is passed to the `dtype` constructor
-# NOTE: `builtins.object` should not be included here
-_BuiltinObjectLike: TypeAlias = Decimal | Fraction
-
 # can be anything, is case-insensitive, and only the first character matters
 _ByteOrder: TypeAlias = L[
     "S",                 # swap the current order (default)
@@ -898,7 +811,7 @@ _DTypeBuiltinKind: TypeAlias = L[0, 1, 2]
 _ArrayAPIVersion: TypeAlias = L["2021.12", "2022.12", "2023.12"]
 _Device: TypeAlias = L["cpu"]
 
-_OrderCF: TypeAlias = L["C", "F"] | None
+_OrderCF: TypeAlias = L["C", "F"] | None  # noqa: PYI047
 _OrderACF: TypeAlias = L["A", "C", "F"] | None
 _OrderKACF: TypeAlias = L["K", "A", "C", "F"] | None
 
@@ -941,7 +854,6 @@ _IntTD64Unit: TypeAlias = L[_MonthUnit, _IntTimeUnit]
 _TD64Unit: TypeAlias = L[_DateUnit, _TimeUnit]
 _TimeUnitSpec: TypeAlias = _TD64UnitT | tuple[_TD64UnitT, CanIndex]
 
-_BinOperandComplex128_co: TypeAlias = complex | float64 | _integer32_min
 _ToReal: TypeAlias = float | CanComplex | CanFloat | CanIndex
 _ToImag: TypeAlias = float | CanFloat | CanIndex
 
diff --git a/src/numpy-stubs/_core/_dtype.pyi b/src/numpy-stubs/_core/_dtype.pyi
@@ -7,7 +7,6 @@ import numpy as np
 
 _T = TypeVar("_T")
 
-_Kind: TypeAlias = L["u", "i", "c", "f", "b", "V", "O", "M", "m", "S", "U"]
 _Name: TypeAlias = L[
     "uint", "int", "complex", "float", "bool", "void", "object", "datetime", "timedelta", "bytes", "str"
 ]
diff --git a/src/numpy-stubs/_core/overrides.pyi b/src/numpy-stubs/_core/overrides.pyi
@@ -1,5 +1,5 @@
 from collections.abc import Callable, Iterable
-from typing import Any, Final, NamedTuple, TypeAlias
+from typing import Any, Final, NamedTuple
 from typing_extensions import ParamSpec, TypeVar
 
 from numpy._typing import _SupportsArrayFunc
@@ -8,8 +8,6 @@ _T = TypeVar("_T")
 _Tss = ParamSpec("_Tss")
 _FuncT = TypeVar("_FuncT", bound=Callable[..., object])
 
-_AnyFunc: TypeAlias = Callable[..., Any]
-
 ###
 
 ARRAY_FUNCTIONS: set[Callable[..., Any]] = ...
@@ -21,7 +19,7 @@ class ArgSpec(NamedTuple):
     keywords: str | None
     defaults: tuple[Any, ...]
 
-def get_array_function_like_doc(public_api: Callable[..., Any], docstring_template: str = "") -> str: ...
+def get_array_function_like_doc(public_api: Callable[..., object], docstring_template: str = "") -> str: ...
 def finalize_array_function_like(public_api: _FuncT) -> _FuncT: ...
 
 #
diff --git a/src/numpy-stubs/_typing/__init__.pyi b/src/numpy-stubs/_typing/__init__.pyi
@@ -19,7 +19,6 @@ from ._array_like import (
     _ArrayLikeTD64_co as _ArrayLikeTD64_co,
     _ArrayLikeUInt_co as _ArrayLikeUInt_co,
     _ArrayLikeVoid_co as _ArrayLikeVoid_co,
-    _FiniteNestedSequence as _FiniteNestedSequence,
     _SupportsArray as _SupportsArray,
     _SupportsArrayFunc as _SupportsArrayFunc,
 )
diff --git a/src/numpy-stubs/_typing/_array_like.pyi b/src/numpy-stubs/_typing/_array_like.pyi
@@ -1,4 +1,4 @@
-from collections.abc import Callable, Collection, Sequence
+from collections.abc import Callable, Collection
 from typing import Any, Protocol, TypeAlias, runtime_checkable
 from typing_extensions import Buffer, TypeVar
 
@@ -35,14 +35,6 @@ class _SupportsArrayFunc(Protocol):  # noqa: PYI046
         kwargs: dict[str, Any],
     ) -> object: ...
 
-_FiniteNestedSequence: TypeAlias = (
-    _T
-    | Sequence[_T]
-    | Sequence[Sequence[_T]]
-    | Sequence[Sequence[Sequence[_T]]]
-    | Sequence[Sequence[Sequence[Sequence[_T]]]]
-)
-
 # A subset of `npt.ArrayLike` that can be parametrized w.r.t. `np.generic`
 _ArrayLike: TypeAlias = _SupportsArray[np.dtype[_ScalarT]] | _NestedSequence[_SupportsArray[np.dtype[_ScalarT]]]
 
@@ -55,6 +47,11 @@ _DualArrayLike: TypeAlias = (
 
 ArrayLike: TypeAlias = _DualArrayLike[np.dtype, complex | str | bytes] | Buffer
 
+# TODO(jorenham): get rid of this in favor of the ones in `_numtype`
+# https://github.com/numpy/numtype/issues/568
+
+# ruff: noqa: PYI047
+
 # `ArrayLike<X>_co`: array-like objects that can be coerced into `X`
 # given the casting rules `same_kind`
 _ArrayLikeBool_co: TypeAlias = _DualArrayLike[np.dtype[np.bool], bool]
diff --git a/src/numpy-stubs/_typing/_char_codes.pyi b/src/numpy-stubs/_typing/_char_codes.pyi
@@ -1,5 +1,10 @@
 from typing import Literal, TypeAlias
 
+# TODO(jorenham): move these to `_numtype` instead
+# https://github.com/numpy/numtype/issues/567
+
+# ruff: noqa: PYI047
+
 _BoolCodes: TypeAlias = Literal["bool", "bool_", "b1", "?", "|?", "=?", "<?", ">?", "\x00"]
 
 _Int8Codes: TypeAlias = Literal["int8", "byte", "i1", "b", "|i1", "|b", "=i1", "=b", "<i1", "<b", ">i1", ">b", "\x01"]
diff --git a/src/numpy-stubs/_typing/_dtype_like.pyi b/src/numpy-stubs/_typing/_dtype_like.pyi
@@ -48,6 +48,10 @@ _DTypeLike: TypeAlias = type[_ScalarT] | np.dtype[_ScalarT] | _SupportsDType[np.
 # Would create a dtype[np.void]
 _VoidDTypeLike: TypeAlias = tuple[Any, Any] | list[Any] | _DTypeDict
 
+# TODO(jorenahm): remove these `_DTypeLike*` aliases in favor of `_numtype.ToDType*`:
+# https://github.com/numpy/numtype/issues/566
+# ruff: noqa: PYI047
+
 # Aliases for commonly used dtype-like objects.
 # Note that the precision of `np.number` subclasses is ignored herein.
 _DTypeLikeBool: TypeAlias = type[bool] | _DTypeLike[np.bool] | _BoolCodes
diff --git a/src/numpy-stubs/_typing/_scalars.pyi b/src/numpy-stubs/_typing/_scalars.pyi
@@ -1,7 +1,11 @@
+# TODO(jorenham): get rid of these in favor of `_?numtype`
+
 from typing import Any, TypeAlias
 
 import numpy as np
 
+# ruff: noqa: PYI047
+
 # NOTE: `_StrLike_co` and `_BytesLike_co` are pointless, as `np.str_` and
 # `np.bytes_` are already subclasses of their builtin counterpart
 _CharLike_co: TypeAlias = str | bytes
@@ -14,7 +18,7 @@ _IntLike_co: TypeAlias = int | np.integer | np.bool
 _FloatLike_co: TypeAlias = float | np.floating | np.integer | np.bool
 _ComplexLike_co: TypeAlias = complex | np.number | np.bool
 _NumberLike_co = _ComplexLike_co
-_TD64Like_co: TypeAlias = int | np.timedelta64 | np.integer | np.bool
+_TD64Like_co: TypeAlias = _IntLike_co | np.timedelta64
 _ScalarLike_co: TypeAlias = complex | bytes | str | np.generic
 
 # `_VoidLike_co` is technically not a scalar, but it's close enough
diff --git a/src/numpy-stubs/_typing/_shape.pyi b/src/numpy-stubs/_typing/_shape.pyi
@@ -1,5 +1,7 @@
 from collections.abc import Sequence
 from typing import SupportsIndex, TypeAlias
 
+# TODO(jorenham): https://github.com/numpy/numtype/issues/565
+
 # Anything that can be coerced to a shape tuple
-_ShapeLike: TypeAlias = SupportsIndex | Sequence[SupportsIndex]
+_ShapeLike: TypeAlias = SupportsIndex | Sequence[SupportsIndex]  # noqa: PYI047
diff --git a/src/numpy-stubs/linalg/_linalg.pyi b/src/numpy-stubs/linalg/_linalg.pyi
@@ -46,9 +46,6 @@ __all__ = [
 
 ###
 
-_SafeFloating: TypeAlias = np.float32 | np.float64
-_SafeInexact: TypeAlias = _SafeFloating | np.complex64 | np.complex128
-
 _T = TypeVar("_T")
 _ArrayT = TypeVar("_ArrayT", bound=_nt.Array[Any])
 _Shape2NDT = TypeVar("_Shape2NDT", bound=_nt.Shape2N)
@@ -97,7 +94,6 @@ _ToInt: TypeAlias = SupportsInt | CanIndex
 _Ax2: TypeAlias = _ToInt | _2Tuple[_ToInt]
 _Axes: TypeAlias = Iterable[int]
 
-_ArrayOrScalar: TypeAlias = _ScalarT | _nt.Array[_ScalarT]
 _Ord: TypeAlias = L[1, -1, 2, -2, "fro", "nuc"] | float
 _UPLO: TypeAlias = L["L", "U", "l", "u"]
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ import numpy as np`
`7`	`7`
`8`	`8`	`_T = TypeVar("_T")`
`9`	`9`
`10`		`-_Kind: TypeAlias = L["u", "i", "c", "f", "b", "V", "O", "M", "m", "S", "U"]`
`11`	`10`	`_Name: TypeAlias = L[`
`12`	`11`	`"uint", "int", "complex", "float", "bool", "void", "object", "datetime", "timedelta", "bytes", "str"`
`13`	`12`	`]`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ from ._array_like import (`
`19`	`19`	`_ArrayLikeTD64_co as _ArrayLikeTD64_co,`
`20`	`20`	`_ArrayLikeUInt_co as _ArrayLikeUInt_co,`
`21`	`21`	`_ArrayLikeVoid_co as _ArrayLikeVoid_co,`
`22`		`- _FiniteNestedSequence as _FiniteNestedSequence,`
`23`	`22`	`_SupportsArray as _SupportsArray,`
`24`	`23`	`_SupportsArrayFunc as _SupportsArrayFunc,`
`25`	`24`	`)`