Merge pull request numpy#27511 from jorenham/typing/TypeAlias

TYP: Annotate type aliases without annotation

Author: charris

numpy/_core/_asarray.pyi

@@ -1,19 +1,19 @@
 from collections.abc import Iterable
-from typing import Any, TypeVar, overload, Literal
+from typing import Any, TypeAlias, TypeVar, overload, Literal
 
 from numpy._typing import NDArray, DTypeLike, _SupportsArrayFunc
 
 _ArrayType = TypeVar("_ArrayType", bound=NDArray[Any])
 
-_Requirements = Literal[
+_Requirements: TypeAlias = Literal[
     "C", "C_CONTIGUOUS", "CONTIGUOUS",
     "F", "F_CONTIGUOUS", "FORTRAN",
     "A", "ALIGNED",
     "W", "WRITEABLE",
     "O", "OWNDATA"
 ]
-_E = Literal["E", "ENSUREARRAY"]
-_RequirementsWithE = _Requirements | _E
+_E: TypeAlias = Literal["E", "ENSUREARRAY"]
+_RequirementsWithE: TypeAlias = _Requirements | _E
 
 @overload
 def require(

numpy/_core/_ufunc_config.pyi

@@ -1,10 +1,10 @@
 from collections.abc import Callable
-from typing import Any, Literal, TypedDict
+from typing import Any, Literal, TypeAlias, TypedDict
 
 from numpy import _SupportsWrite
 
-_ErrKind = Literal["ignore", "warn", "raise", "call", "print", "log"]
-_ErrFunc = Callable[[str, int], Any]
+_ErrKind: TypeAlias = Literal["ignore", "warn", "raise", "call", "print", "log"]
+_ErrFunc: TypeAlias = Callable[[str, int], Any]
 
 class _ErrDict(TypedDict):
     divide: _ErrKind

numpy/_core/arrayprint.pyi

@@ -1,5 +1,5 @@
 from collections.abc import Callable
-from typing import Any, Literal, TypedDict, SupportsIndex
+from typing import Any, Literal, TypeAlias, TypedDict, SupportsIndex
 
 # Using a private class is by no means ideal, but it is simply a consequence
 # of a `contextlib.context` returning an instance of aforementioned class
@@ -18,7 +18,7 @@ from numpy import (
 )
 from numpy._typing import NDArray, _CharLike_co, _FloatLike_co
 
-_FloatMode = Literal["fixed", "unique", "maxprec", "maxprec_equal"]
+_FloatMode: TypeAlias = Literal["fixed", "unique", "maxprec", "maxprec_equal"]
 
 class _FormatDict(TypedDict, total=False):
     bool: Callable[[np.bool], str]

numpy/_core/einsumfunc.pyi

@@ -1,5 +1,5 @@
 from collections.abc import Sequence
-from typing import TypeVar, Any, overload, Literal
+from typing import TypeAlias, TypeVar, Any, overload, Literal
 
 import numpy as np
 from numpy import number, _OrderKACF
@@ -25,9 +25,9 @@ _ArrayType = TypeVar(
     bound=NDArray[np.bool | number[Any]],
 )
 
-_OptimizeKind = None | bool | Literal["greedy", "optimal"] | Sequence[Any]
-_CastingSafe = Literal["no", "equiv", "safe", "same_kind"]
-_CastingUnsafe = Literal["unsafe"]
+_OptimizeKind: TypeAlias = bool | Literal["greedy", "optimal"] | Sequence[Any] | None
+_CastingSafe: TypeAlias = Literal["no", "equiv", "safe", "same_kind"]
+_CastingUnsafe: TypeAlias = Literal["unsafe"]
 
 __all__: list[str]
 

numpy/_core/multiarray.pyi

@@ -112,7 +112,7 @@ _1DArray: TypeAlias = ndarray[tuple[_SizeType], dtype[_SCT]]
 _Array: TypeAlias = ndarray[_ShapeType, dtype[_SCT]]
 
 # Valid time units
-_UnitKind = L[
+_UnitKind: TypeAlias = L[
     "Y",
     "M",
     "D",
@@ -126,7 +126,7 @@ _UnitKind = L[
     "fs",
     "as",
 ]
-_RollKind = L[  # `raise` is deliberately excluded
+_RollKind: TypeAlias = L[  # `raise` is deliberately excluded
     "nat",
     "forward",
     "following",
@@ -1164,7 +1164,7 @@ def compare_chararrays(
 
 def add_docstring(obj: Callable[..., Any], docstring: str, /) -> None: ...
 
-_GetItemKeys = L[
+_GetItemKeys: TypeAlias = L[
     "C", "CONTIGUOUS", "C_CONTIGUOUS",
     "F", "FORTRAN", "F_CONTIGUOUS",
     "W", "WRITEABLE",
@@ -1177,7 +1177,7 @@ _GetItemKeys = L[
     "FNC",
     "FORC",
 ]
-_SetItemKeys = L[
+_SetItemKeys: TypeAlias = L[
     "A", "ALIGNED",
     "W", "WRITEABLE",
     "X", "WRITEBACKIFCOPY",

numpy/_core/numeric.pyi

@@ -2,6 +2,7 @@ from collections.abc import Callable, Sequence
 from typing import (
     Any,
     Final,
+    TypeAlias,
     overload,
     TypeVar,
     Literal as L,
@@ -61,7 +62,7 @@ _ArrayType = TypeVar("_ArrayType", bound=np.ndarray[Any, Any])
 _SizeType = TypeVar("_SizeType", bound=int)
 _ShapeType = TypeVar("_ShapeType", bound=tuple[int, ...])
 
-_CorrelateMode = L["valid", "same", "full"]
+_CorrelateMode: TypeAlias = L["valid", "same", "full"]
 
 __all__: list[str]
 

numpy/_core/records.pyi

@@ -3,6 +3,7 @@ from collections.abc import Sequence, Iterable
 from types import EllipsisType
 from typing import (
     Any,
+    TypeAlias,
     TypeVar,
     overload,
     Protocol,
@@ -35,7 +36,7 @@ from numpy._typing import (
 
 _SCT = TypeVar("_SCT", bound=generic)
 
-_RecArray = recarray[Any, dtype[_SCT]]
+_RecArray: TypeAlias = recarray[Any, dtype[_SCT]]
 
 class _SupportsReadInto(Protocol):
     def seek(self, offset: int, whence: int, /) -> object: ...

numpy/ctypeslib.pyi

@@ -8,6 +8,7 @@ from collections.abc import Iterable, Sequence
 from typing import (
     Literal as L,
     Any,
+    TypeAlias,
     TypeVar,
     Generic,
     overload,
@@ -72,7 +73,7 @@ _DType = TypeVar("_DType", bound=dtype[Any])
 _DTypeOptional = TypeVar("_DTypeOptional", bound=None | dtype[Any])
 _SCT = TypeVar("_SCT", bound=generic)
 
-_FlagsKind = L[
+_FlagsKind: TypeAlias = L[
     'C_CONTIGUOUS', 'CONTIGUOUS', 'C',
     'F_CONTIGUOUS', 'FORTRAN', 'F',
     'ALIGNED', 'A',

numpy/fft/_pocketfft.pyi

@@ -1,10 +1,10 @@
 from collections.abc import Sequence
-from typing import Literal as L
+from typing import Literal as L, TypeAlias
 
 from numpy import complex128, float64
 from numpy._typing import ArrayLike, NDArray, _ArrayLikeNumber_co
 
-_NormKind = L[None, "backward", "ortho", "forward"]
+_NormKind: TypeAlias = L[None, "backward", "ortho", "forward"]
 
 __all__: list[str]
 

numpy/lib/_arraypad_impl.pyi

@@ -1,6 +1,7 @@
 from typing import (
     Literal as L,
     Any,
+    TypeAlias,
     overload,
     TypeVar,
     Protocol,
@@ -27,7 +28,7 @@ class _ModeFunc(Protocol):
         /,
     ) -> None: ...
 
-_ModeKind = L[
+_ModeKind: TypeAlias = L[
     "constant",
     "edge",
     "linear_ramp",