Add typing for long. Add release note

mtsokol · mtsokol · commit b68854d6ae71 · 2023-10-13T16:02:16.000+02:00
diff --git a/doc/release/upcoming_changes/24922.new_feature.rst b/doc/release/upcoming_changes/24922.new_feature.rst
@@ -0,0 +1,5 @@
+`numpy.long` and `numpy.ulong`
+------------------------------
+
+`numpy.long` and `numpy.ulong` have been reintroduced as a direct
+mapping to C's ``long`` and ``unsigned long`` types.
diff --git a/numpy/__init__.pyi b/numpy/__init__.pyi
@@ -71,6 +71,7 @@ from numpy._typing import (
     _NBitIntC,
     _NBitIntP,
     _NBitInt,
+    _NBitLong,
     _NBitLongLong,
     _NBitHalf,
     _NBitSingle,
@@ -97,12 +98,14 @@ from numpy._typing import (
     _IntCCodes,
     _IntPCodes,
     _IntCodes,
+    _LongCodes,
     _LongLongCodes,
     _UByteCodes,
     _UShortCodes,
     _UIntCCodes,
     _UIntPCodes,
     _UIntCodes,
+    _ULongCodes,
     _ULongLongCodes,
     _HalfCodes,
     _SingleCodes,
@@ -2858,6 +2861,7 @@ short = signedinteger[_NBitShort]
 intc = signedinteger[_NBitIntC]
 intp = signedinteger[_NBitIntP]
 int_ = signedinteger[_NBitInt]
+long = signedinteger[_NBitLong]
 longlong = signedinteger[_NBitLongLong]
 
 # TODO: `item`/`tolist` returns either `dt.timedelta` or `int`
@@ -2939,6 +2943,7 @@ ushort = unsignedinteger[_NBitShort]
 uintc = unsignedinteger[_NBitIntC]
 uintp = unsignedinteger[_NBitIntP]
 uint = unsignedinteger[_NBitInt]
+ulong = unsignedinteger[_NBitLong]
 ulonglong = unsignedinteger[_NBitLongLong]
 
 class inexact(number[_NBit1]):  # type: ignore
diff --git a/numpy/_typing/__init__.py b/numpy/_typing/__init__.py
@@ -98,6 +98,7 @@ class _8Bit(_16Bit):  # type: ignore[misc]
     _NBitIntC as _NBitIntC,
     _NBitIntP as _NBitIntP,
     _NBitInt as _NBitInt,
+    _NBitLong as _NBitLong,
     _NBitLongLong as _NBitLongLong,
     _NBitHalf as _NBitHalf,
     _NBitSingle as _NBitSingle,
@@ -124,12 +125,14 @@ class _8Bit(_16Bit):  # type: ignore[misc]
     _IntCCodes as _IntCCodes,
     _IntPCodes as _IntPCodes,
     _IntCodes as _IntCodes,
+    _LongCodes as _LongCodes,
     _LongLongCodes as _LongLongCodes,
     _UByteCodes as _UByteCodes,
     _UShortCodes as _UShortCodes,
     _UIntCCodes as _UIntCCodes,
     _UIntPCodes as _UIntPCodes,
     _UIntCodes as _UIntCodes,
+    _ULongCodes as _ULongCodes,
     _ULongLongCodes as _ULongLongCodes,
     _HalfCodes as _HalfCodes,
     _SingleCodes as _SingleCodes,
diff --git a/numpy/_typing/_char_codes.py b/numpy/_typing/_char_codes.py
@@ -23,14 +23,16 @@
 _ShortCodes = Literal["short", "h", "=h", "<h", ">h"]
 _IntCCodes = Literal["intc", "i", "=i", "<i", ">i"]
 _IntPCodes = Literal["intp", "p", "=p", "<p", ">p"]
-_IntCodes = Literal["long", "int", "int_", "l", "=l", "<l", ">l"]
+_IntCodes = Literal["int", "int_", "l", "=l", "<l", ">l"]
+_LongCodes = Literal["long"]
 _LongLongCodes = Literal["longlong", "q", "=q", "<q", ">q"]
 
 _UByteCodes = Literal["ubyte", "B", "=B", "<B", ">B"]
 _UShortCodes = Literal["ushort", "H", "=H", "<H", ">H"]
 _UIntCCodes = Literal["uintc", "I", "=I", "<I", ">I"]
 _UIntPCodes = Literal["uintp", "P", "=P", "<P", ">P"]
-_UIntCodes = Literal["ulong", "uint", "L", "=L", "<L", ">L"]
+_UIntCodes = Literal["uint", "L", "=L", "<L", ">L"]
+_ULongCodes = Literal["ulong"]
 _ULongLongCodes = Literal["ulonglong", "Q", "=Q", "<Q", ">Q"]
 
 _HalfCodes = Literal["half", "e", "=e", "<e", ">e"]
diff --git a/numpy/_typing/_nbit.py b/numpy/_typing/_nbit.py
@@ -8,6 +8,7 @@
 _NBitIntC = Any
 _NBitIntP = Any
 _NBitInt = Any
+_NBitLong = Any
 _NBitLongLong = Any
 
 _NBitHalf = Any
diff --git a/numpy/typing/mypy_plugin.py b/numpy/typing/mypy_plugin.py
@@ -60,6 +60,7 @@ def _get_precision_dict() -> dict[str, str]:
         ("_NBitIntC", np.intc),
         ("_NBitIntP", np.intp),
         ("_NBitInt", np.int_),
+        ("_NBitLong", np.long),
         ("_NBitLongLong", np.longlong),
 
         ("_NBitHalf", np.half),
