Merge pull request numpy#27132 from jorenham/typing/dtype-constructor-specialization

TYP: Assume that ``typing_extensions`` is always available in the stubs

Author: rgommers

numpy/__init__.pyi

@@ -184,7 +184,6 @@ from collections.abc import (
     Sequence,
 )
 from typing import (
-    TYPE_CHECKING,
     Literal as L,
     Any,
     Generator,
@@ -203,12 +202,12 @@ from typing import (
     TypeAlias,
 )
 
-if sys.version_info >= (3, 11):
-    from typing import LiteralString
-elif TYPE_CHECKING:
-    from typing_extensions import LiteralString
-else:
-    LiteralString: TypeAlias = str
+# NOTE: `typing_extensions` is always available in `.pyi` stubs or when
+# `TYPE_CHECKING` - even if not available at runtime.
+# This is because the `typeshed` stubs for the standard library include
+# `typing_extensions` stubs:
+# https://github.com/python/typeshed/blob/main/stdlib/typing_extensions.pyi
+from typing_extensions import LiteralString
 
 # Ensures that the stubs are picked up
 from numpy import (

numpy/_array_api_info.pyi

@@ -1,6 +1,4 @@
-import sys
 from typing import (
-    TYPE_CHECKING,
     ClassVar,
     Literal,
     TypeAlias,
@@ -9,17 +7,10 @@ from typing import (
     final,
     overload,
 )
+from typing_extensions import Never
 
 import numpy as np
 
-if sys.version_info >= (3, 11):
-    from typing import Never
-elif TYPE_CHECKING:
-    from typing_extensions import Never
-else:
-    # `NoReturn` and `Never` are equivalent (but not equal) for type-checkers,
-    # but are used in different places by convention
-    from typing import NoReturn as Never
 
 _Device: TypeAlias = Literal["cpu"]
 _DeviceLike: TypeAlias = None | _Device

numpy/polynomial/_polybase.pyi

@@ -1,10 +1,8 @@
 import abc
 import decimal
 import numbers
-import sys
 from collections.abc import Iterator, Mapping, Sequence
 from typing import (
-    TYPE_CHECKING,
     Any,
     ClassVar,
     Final,
@@ -44,12 +42,7 @@ from ._polytypes import (
     _ArrayLikeCoef_co,
 )
 
-if sys.version_info >= (3, 11):
-    from typing import LiteralString
-elif TYPE_CHECKING:
-    from typing_extensions import LiteralString
-else:
-    LiteralString: TypeAlias = str
+from typing_extensions import LiteralString
 
 
 __all__: Final[Sequence[str]] = ("ABCPolyBase",)

numpy/polynomial/_polytypes.pyi

@@ -1,7 +1,5 @@
-import sys
 from collections.abc import Callable, Sequence
 from typing import (
-    TYPE_CHECKING,
     Any,
     Literal,
     NoReturn,
@@ -31,12 +29,7 @@ from numpy._typing import (
     _NumberLike_co,
 )
 
-if sys.version_info >= (3, 11):
-    from typing import LiteralString
-elif TYPE_CHECKING:
-    from typing_extensions import LiteralString
-else:
-    LiteralString: TypeAlias = str
+from typing_extensions import LiteralString
 
 _T = TypeVar("_T")
 _T_contra = TypeVar("_T_contra", contravariant=True)

numpy/typing/tests/data/reveal/arithmetic.pyi

@@ -1,14 +1,10 @@
-import sys
 from typing import Any
 
 import numpy as np
 import numpy.typing as npt
 from numpy._typing import _32Bit,_64Bit, _128Bit
 
-if sys.version_info >= (3, 11):
-    from typing import assert_type
-else:
-    from typing_extensions import assert_type
+from typing_extensions import assert_type
 
 # Can't directly import `np.float128` as it is not available on all platforms
 f16: np.floating[_128Bit]

numpy/typing/tests/data/reveal/array_api_info.pyi

@@ -1,12 +1,8 @@
-import sys
 from typing import Literal
 
 import numpy as np
 
-if sys.version_info >= (3, 11):
-    from typing import Never, assert_type
-else:
-    from typing_extensions import Never, assert_type
+from typing_extensions import Never, assert_type
 
 info = np.__array_namespace_info__()
 

numpy/typing/tests/data/reveal/array_constructors.pyi

@@ -6,10 +6,7 @@ from collections import deque
 import numpy as np
 import numpy.typing as npt
 
-if sys.version_info >= (3, 11):
-    from typing import assert_type
-else:
-    from typing_extensions import assert_type
+from typing_extensions import assert_type
 
 _SCT = TypeVar("_SCT", bound=np.generic, covariant=True)
 

numpy/typing/tests/data/reveal/arraypad.pyi

@@ -1,14 +1,10 @@
-import sys
 from collections.abc import Mapping
 from typing import Any, SupportsIndex
 
 import numpy as np
 import numpy.typing as npt
 
-if sys.version_info >= (3, 11):
-    from typing import assert_type
-else:
-    from typing_extensions import assert_type
+from typing_extensions import assert_type
 
 def mode_func(
     ar: npt.NDArray[np.number[Any]],

numpy/typing/tests/data/reveal/arrayprint.pyi

@@ -1,4 +1,3 @@
-import sys
 import contextlib
 from collections.abc import Callable
 from typing import Any
@@ -7,10 +6,7 @@ import numpy as np
 import numpy.typing as npt
 from numpy._core.arrayprint import _FormatOptions
 
-if sys.version_info >= (3, 11):
-    from typing import assert_type
-else:
-    from typing_extensions import assert_type
+from typing_extensions import assert_type
 
 AR: npt.NDArray[np.int64]
 func_float: Callable[[np.floating[Any]], str]

numpy/typing/tests/data/reveal/arraysetops.pyi

@@ -1,4 +1,3 @@
-import sys
 from typing import Any
 
 import numpy as np
@@ -7,10 +6,7 @@ from numpy.lib._arraysetops_impl import (
     UniqueAllResult, UniqueCountsResult, UniqueInverseResult
 )
 
-if sys.version_info >= (3, 11):
-    from typing import assert_type
-else:
-    from typing_extensions import assert_type
+from typing_extensions import assert_type
 
 AR_b: npt.NDArray[np.bool]
 AR_i8: npt.NDArray[np.int64]