Merge pull request numpy#28720 from jorenham/typing/drop-py310

TYP: drop py310 support

Author: charris

numpy/__config__.pyi

@@ -1,7 +1,7 @@
 from enum import Enum
 from types import ModuleType
-from typing import Final, Literal as L, TypedDict, overload, type_check_only
-from typing_extensions import NotRequired
+from typing import Final, NotRequired, TypedDict, overload, type_check_only
+from typing import Literal as L
 
 _CompilerConfigDictValue = TypedDict(
     "_CompilerConfigDictValue",

numpy/__init__.pyi

@@ -211,14 +211,19 @@ from typing import (
     Final,
     Generic,
     Literal as L,
+    LiteralString,
+    Never,
     NoReturn,
+    Protocol,
+    Self,
     SupportsComplex,
     SupportsFloat,
     SupportsInt,
     SupportsIndex,
     TypeAlias,
     TypedDict,
     final,
+    overload,
     type_check_only,
 )
 
@@ -227,7 +232,7 @@ from typing import (
 # library include `typing_extensions` stubs:
 # https://github.com/python/typeshed/blob/main/stdlib/typing_extensions.pyi
 from _typeshed import StrOrBytesPath, SupportsFlush, SupportsLenAndGetItem, SupportsWrite
-from typing_extensions import CapsuleType, LiteralString, Never, Protocol, Self, TypeVar, Unpack, overload
+from typing_extensions import CapsuleType, TypeVar
 
 from numpy import (
     char,
@@ -813,7 +818,7 @@ _ShapeT = TypeVar("_ShapeT", bound=_Shape)
 _ShapeT_co = TypeVar("_ShapeT_co", bound=_Shape, covariant=True)
 _1DShapeT = TypeVar("_1DShapeT", bound=_1D)
 _2DShapeT_co = TypeVar("_2DShapeT_co", bound=_2D, covariant=True)
-_1NShapeT = TypeVar("_1NShapeT", bound=tuple[L[1], Unpack[tuple[L[1], ...]]])  # (1,) | (1, 1) | (1, 1, 1) | ...
+_1NShapeT = TypeVar("_1NShapeT", bound=tuple[L[1], *tuple[L[1], ...]])  # (1,) | (1, 1) | (1, 1, 1) | ...
 
 _ScalarT = TypeVar("_ScalarT", bound=generic)
 _ScalarT_co = TypeVar("_ScalarT_co", bound=generic, default=Any, covariant=True)
@@ -2543,7 +2548,7 @@ class ndarray(_ArrayOrScalarCommon, Generic[_ShapeT_co, _DTypeT_co]):
     @overload  # == 1-d
     def __iter__(self: ndarray[tuple[int], dtype[_ScalarT]], /) -> Iterator[_ScalarT]: ...
     @overload  # >= 2-d
-    def __iter__(self: ndarray[tuple[int, int, Unpack[tuple[int, ...]]], dtype[_ScalarT]], /) -> Iterator[NDArray[_ScalarT]]: ...
+    def __iter__(self: ndarray[tuple[int, int, *tuple[int, ...]], dtype[_ScalarT]], /) -> Iterator[NDArray[_ScalarT]]: ...
     @overload  # ?-d
     def __iter__(self, /) -> Iterator[Any]: ...
 
@@ -3727,7 +3732,7 @@ class generic(_ArrayOrScalarCommon, Generic[_ItemT_co]):
         *sizes6_: SupportsIndex,
         order: _OrderACF = "C",
         copy: builtins.bool | None = None,
-    ) -> ndarray[tuple[L[1], L[1], L[1], L[1], L[1], Unpack[tuple[L[1], ...]]], dtype[Self]]: ...
+    ) -> ndarray[tuple[L[1], L[1], L[1], L[1], L[1], *tuple[L[1], ...]], dtype[Self]]: ...
 
     def squeeze(self, axis: None | L[0] | tuple[()] = ...) -> Self: ...
     def transpose(self, axes: None | tuple[()] = ..., /) -> Self: ...

numpy/_array_api_info.pyi

@@ -1,19 +1,19 @@
 from typing import (
     ClassVar,
     Literal,
+    Never,
     TypeAlias,
     TypedDict,
     TypeVar,
     final,
     overload,
     type_check_only,
 )
-from typing_extensions import Never
 
 import numpy as np
 
 _Device: TypeAlias = Literal["cpu"]
-_DeviceLike: TypeAlias = None | _Device
+_DeviceLike: TypeAlias = _Device | None
 
 _Capabilities = TypedDict(
     "_Capabilities",

numpy/_core/_exceptions.pyi

@@ -1,7 +1,5 @@
 from collections.abc import Iterable
-from typing import Any, Final, overload
-
-from typing_extensions import TypeVar, Unpack
+from typing import Any, Final, TypeVar, overload
 
 import numpy as np
 from numpy import _CastingKind
@@ -10,7 +8,7 @@ from numpy._utils import set_module as set_module
 ###
 
 _T = TypeVar("_T")
-_TupleT = TypeVar("_TupleT", bound=tuple[()] | tuple[Any, Any, Unpack[tuple[Any, ...]]])
+_TupleT = TypeVar("_TupleT", bound=tuple[()] | tuple[Any, Any, *tuple[Any, ...]])
 _ExceptionT = TypeVar("_ExceptionT", bound=Exception)
 
 ###

numpy/_core/_internal.pyi

@@ -1,9 +1,9 @@
 import ctypes as ct
 import re
 from collections.abc import Callable, Iterable
-from typing import Any, Final, Generic, overload
+from typing import Any, Final, Generic, Self, overload
 
-from typing_extensions import Self, TypeVar, deprecated
+from typing_extensions import TypeVar, deprecated
 
 import numpy as np
 import numpy.typing as npt

numpy/_core/_machar.pyi

@@ -1,7 +1,5 @@
 from collections.abc import Iterable
-from typing import Any, Final, overload
-
-from typing_extensions import TypeVar, Unpack
+from typing import Any, Final, TypeVar, overload
 
 import numpy as np
 from numpy import _CastingKind
@@ -10,7 +8,7 @@ from numpy._utils import set_module as set_module
 ###
 
 _T = TypeVar("_T")
-_TupleT = TypeVar("_TupleT", bound=tuple[()] | tuple[Any, Any, Unpack[tuple[Any, ...]]])
+_TupleT = TypeVar("_TupleT", bound=tuple[()] | tuple[Any, Any, *tuple[Any, ...]])
 _ExceptionT = TypeVar("_ExceptionT", bound=Exception)
 
 ###

numpy/_core/_methods.pyi

@@ -1,7 +1,5 @@
 from collections.abc import Callable
-from typing import Any, TypeAlias
-
-from typing_extensions import Concatenate
+from typing import Any, Concatenate, TypeAlias
 
 import numpy as np
 

numpy/_core/fromnumeric.pyi

@@ -3,6 +3,7 @@ from collections.abc import Sequence
 from typing import (
     Any,
     Literal,
+    Never,
     Protocol,
     SupportsIndex,
     TypeAlias,
@@ -12,7 +13,7 @@ from typing import (
 )
 
 from _typeshed import Incomplete
-from typing_extensions import Never, deprecated
+from typing_extensions import deprecated
 
 import numpy as np
 from numpy import (

numpy/_core/multiarray.pyi

@@ -14,9 +14,10 @@ from typing import (
     Final,
     Protocol,
     ClassVar,
+    Unpack,
     type_check_only,
 )
-from typing_extensions import CapsuleType, Unpack
+from typing_extensions import CapsuleType
 
 import numpy as np
 from numpy import (  # type: ignore[attr-defined]

numpy/_core/numeric.pyi

@@ -1,17 +1,5 @@
 from collections.abc import Callable, Sequence
-from typing import (
-    Any,
-    Final,
-    TypeAlias,
-    overload,
-    TypeVar,
-    Literal as L,
-    SupportsAbs,
-    SupportsIndex,
-    NoReturn,
-    TypeGuard,
-)
-from typing_extensions import Unpack
+from typing import Any, Final, TypeAlias, overload, TypeVar, Literal as L, SupportsAbs, SupportsIndex, NoReturn, TypeGuard, Unpack
 
 import numpy as np
 from numpy import (