🚨 ScalarType stubtest error fix

Author: jorenham

src/numpy-stubs/@test/static/accept/numerictypes.pyi

@@ -1,11 +1,11 @@
-from typing import Literal, assert_type
+from typing import Any, Literal, assert_type
 
 import numpy as np
 
 assert_type(np.ScalarType[0], type[int])
 assert_type(np.ScalarType[3], type[bool])
 assert_type(np.ScalarType[8], type[np.csingle])
-assert_type(np.ScalarType[10], type[np.clongdouble])
+assert_type(np.ScalarType[10], type[np.clongdouble | Any])
 assert_type(np.bool_(object()), np.bool)
 
 assert_type(np.typecodes["Character"], Literal["c"])

src/numpy-stubs/_core/numerictypes.pyi

@@ -1,4 +1,3 @@
-import sys
 from builtins import bool as py_bool
 from typing import Any, Final, Literal as L, TypeAlias, TypedDict, type_check_only
 
@@ -155,110 +154,41 @@ class _TypeCodes(TypedDict):
 typecodes: Final[_TypeCodes] = ...
 
 # pyright: reportRedeclaration=false
-# NOTE: The orders of float64/longdouble, int32/int64, and timedelta64/datetime64 are platform dependent.
-# NOTE: We assume 64-bit platforms here.
-if sys.platform == "darwin":
-    _ScalarTypeTuple: TypeAlias = tuple[
-        type[int],
-        type[float],
-        type[complex],
-        type[py_bool],
-        type[bytes],
-        type[str],
-        type[memoryview[Any]],
-        type[Any],  # TODO: bool_?
-        type[complex64],
-        type[complex128],
-        type[clongdouble],
-        type[float16],
-        type[float32],
-        type[longdouble],
-        type[float64],
-        type[int8],
-        type[int16],
-        type[int32],
-        type[int64],
-        type[Any],  # TODO: longlong?
-        type[datetime64[Any]],
-        type[timedelta64[Any]],
-        type[object_],
-        type[bytes_],
-        type[str_],
-        type[uint8],
-        type[uint16],
-        type[uint32],
-        type[uint64],
-        type[Any],  # TODO: ulonglong?
-        type[void],
-    ]
-elif sys.platform == "win32":
-    _ScalarTypeTuple: TypeAlias = tuple[
-        type[int],
-        type[float],
-        type[complex],
-        type[py_bool],
-        type[bytes],
-        type[str],
-        type[memoryview[Any]],
-        type[Any],  # TODO: bool_?
-        type[complex64],
-        type[complex128],
-        type[clongdouble],
-        type[float16],
-        type[float32],
-        type[float64],
-        type[longdouble],
-        type[int8],
-        type[int16],
-        type[int32],
-        type[Any],  # TODO: intc?
-        type[int64],
-        type[datetime64[Any]],
-        type[timedelta64[Any]],
-        type[object_],
-        type[bytes_],
-        type[str_],
-        type[uint8],
-        type[uint16],
-        type[Any],  # TODO: uintc?
-        type[uint32],
-        type[uint64],
-        type[void],
-    ]
-else:  # linux (presumed)
-    _ScalarTypeTuple: TypeAlias = tuple[
-        type[int],
-        type[float],
-        type[complex],
-        type[py_bool],
-        type[bytes],
-        type[str],
-        type[memoryview[Any]],
-        type[bool_[Any]],
-        type[complex64],
-        type[complex128],
-        type[clongdouble],
-        type[float16],
-        type[float32],
-        type[float64],
-        type[longdouble],
-        type[int8],
-        type[int16],
-        type[int32],
-        type[int64],
-        type[longlong],
-        type[timedelta64[Any]],
-        type[datetime64[Any]],
-        type[object_],
-        type[bytes_],
-        type[str_],
-        type[uint8],
-        type[uint16],
-        type[uint32],
-        type[uint64],
-        type[ulonglong],
-        type[void],
-    ]
+# NOTE: The order of same-kind same-itemsize types are unstable, hence the `| Any` in some places.
+# See https://github.com/numpy/numpy/pull/29761 for details
+_ScalarTypeTuple: TypeAlias = tuple[
+    type[int],
+    type[float],
+    type[complex],
+    type[py_bool],
+    type[bytes],
+    type[str],
+    type[memoryview[Any]],
+    type[bool_[Any]],
+    type[complex64],
+    type[complex128 | Any],
+    type[clongdouble | Any],
+    type[float16],
+    type[float32],
+    type[float64 | Any],
+    type[longdouble | Any],
+    type[int8],
+    type[int16],
+    type[int32 | Any],
+    type[long | Any],
+    type[int64],
+    type[datetime64[Any] | Any],
+    type[timedelta64[Any] | Any],
+    type[object_],
+    type[bytes_],
+    type[str_],
+    type[uint8],
+    type[uint16],
+    type[uint32 | Any],
+    type[ulong | Any],
+    type[uint64],
+    type[void],
+]
 
 ScalarType: Final[_ScalarTypeTuple] = ...
 typeDict: Final = sctypeDict