Merge pull request numpy#28525 from jorenham/numtype/229

TYP: fix stubtest errors in ``numpy.dtype`` and ``numpy.dtypes.*``

Author: charris

numpy/__init__.pyi

@@ -1194,8 +1194,21 @@ __future_scalars__: Final[set[L["bytes", "str", "object"]]] = ...
 __array_api_version__: Final[L["2023.12"]] = "2023.12"
 test: Final[PytestTester] = ...
 
+@type_check_only
+class _DTypeMeta(type):
+    @property
+    def type(cls, /) -> type[generic] | None: ...
+    @property
+    def _abstract(cls, /) -> bool: ...
+    @property
+    def _is_numeric(cls, /) -> bool: ...
+    @property
+    def _parametric(cls, /) -> bool: ...
+    @property
+    def _legacy(cls, /) -> bool: ...
+
 @final
-class dtype(Generic[_SCT_co]):
+class dtype(Generic[_SCT_co], metaclass=_DTypeMeta):
     names: None | tuple[builtins.str, ...]
     def __hash__(self) -> int: ...
 

numpy/dtypes.pyi

@@ -1,18 +1,13 @@
-from typing import (
-    Any,
-    Final,
-    Generic,
-    Literal as L,
-    NoReturn,
-    TypeAlias,
-    final,
-    type_check_only,
-)
+# ruff: noqa: ANN401
+from types import MemberDescriptorType
+from typing import Any, ClassVar, Generic, NoReturn, TypeAlias, final, type_check_only
+from typing import Literal as L
+
 from typing_extensions import LiteralString, Self, TypeVar
 
 import numpy as np
 
-__all__ = [
+__all__ = [  # noqa: RUF022
     'BoolDType',
     'Int8DType',
     'ByteDType',
@@ -53,7 +48,7 @@ __all__ = [
 _SCT_co = TypeVar("_SCT_co", bound=np.generic, covariant=True)
 
 @type_check_only
-class _SimpleDType(Generic[_SCT_co], np.dtype[_SCT_co]):  # type: ignore[misc]
+class _SimpleDType(np.dtype[_SCT_co], Generic[_SCT_co]):  # type: ignore[misc]  # pyright: ignore[reportGeneralTypeIssues]
     names: None  # pyright: ignore[reportIncompatibleVariableOverride]
     def __new__(cls, /) -> Self: ...
     def __getitem__(self, key: Any, /) -> NoReturn: ...
@@ -73,7 +68,7 @@ class _SimpleDType(Generic[_SCT_co], np.dtype[_SCT_co]):  # type: ignore[misc]
     def subdtype(self) -> None: ...
 
 @type_check_only
-class _LiteralDType(Generic[_SCT_co], _SimpleDType[_SCT_co]):  # type: ignore[misc]
+class _LiteralDType(_SimpleDType[_SCT_co], Generic[_SCT_co]):  # type: ignore[misc]
     @property
     def flags(self) -> L[0]: ...
     @property
@@ -234,10 +229,11 @@ class UInt64DType(  # type: ignore[misc]
     def str(self) -> L["<u8", ">u8"]: ...
 
 # Standard C-named version/alias:
-ByteDType: Final = Int8DType
-UByteDType: Final = UInt8DType
-ShortDType: Final = Int16DType
-UShortDType: Final = UInt16DType
+# NOTE: Don't make these `Final`: it will break stubtest
+ByteDType = Int8DType
+UByteDType = UInt8DType
+ShortDType = Int16DType
+UShortDType = UInt16DType
 
 @final
 class IntDType(  # type: ignore[misc]
@@ -419,11 +415,11 @@ class ObjectDType(  # type: ignore[misc]
 
 @final
 class BytesDType(  # type: ignore[misc]
-    Generic[_ItemSize_co],
     _TypeCodes[L["S"], L["S"], L[18]],
     _NoOrder,
     _NBit[L[1], _ItemSize_co],
     _SimpleDType[np.bytes_],
+    Generic[_ItemSize_co],
 ):
     def __new__(cls, size: _ItemSize_co, /) -> BytesDType[_ItemSize_co]: ...
     @property
@@ -435,11 +431,11 @@ class BytesDType(  # type: ignore[misc]
 
 @final
 class StrDType(  # type: ignore[misc]
-    Generic[_ItemSize_co],
     _TypeCodes[L["U"], L["U"], L[19]],
     _NativeOrder,
     _NBit[L[4], _ItemSize_co],
     _SimpleDType[np.str_],
+    Generic[_ItemSize_co],
 ):
     def __new__(cls, size: _ItemSize_co, /) -> StrDType[_ItemSize_co]: ...
     @property
@@ -451,11 +447,11 @@ class StrDType(  # type: ignore[misc]
 
 @final
 class VoidDType(  # type: ignore[misc]
-    Generic[_ItemSize_co],
     _TypeCodes[L["V"], L["V"], L[20]],
     _NoOrder,
     _NBit[L[1], _ItemSize_co],
-    np.dtype[np.void],
+    np.dtype[np.void],  # pyright: ignore[reportGeneralTypeIssues]
+    Generic[_ItemSize_co],
 ):
     # NOTE: `VoidDType(...)` raises a `TypeError` at the moment
     def __new__(cls, length: _ItemSize_co, /) -> NoReturn: ...
@@ -578,8 +574,13 @@ class StringDType(  # type: ignore[misc]
     _NativeOrder,
     _NBit[L[8], L[16]],
     # TODO: Replace the (invalid) `str` with the scalar type, once implemented
-    np.dtype[str],  # type: ignore[type-var]
+    np.dtype[str],  # type: ignore[type-var]  # pyright: ignore[reportGeneralTypeIssues,reportInvalidTypeArguments]
 ):
+    @property
+    def coerce(self) -> L[True]: ...
+    na_object: ClassVar[MemberDescriptorType]  # does not get instantiated
+
+    #
     def __new__(cls, /) -> StringDType: ...
     def __getitem__(self, key: Any, /) -> NoReturn: ...
     @property