Skip to content

Commit 887b85b

Browse files
authored
Merge pull request #556 from numpy:dtype-cleanup
✨ os-dependent `dtypes.[U]LongDType` bit-widths and a new `_numtype.ToDType[U]Long` type
2 parents 873b8ea + e70a741 commit 887b85b

File tree

4 files changed

+215
-437
lines changed

4 files changed

+215
-437
lines changed

src/_numtype/__init__.pyi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ from ._dtype import (
4949
ToDTypeInt16 as ToDTypeInt16,
5050
ToDTypeInt32 as ToDTypeInt32,
5151
ToDTypeInt64 as ToDTypeInt64,
52+
ToDTypeLong as ToDTypeLong,
5253
ToDTypeLongDouble as ToDTypeLongDouble,
5354
ToDTypeObject as ToDTypeObject,
5455
ToDTypeStr as ToDTypeStr,
@@ -58,6 +59,7 @@ from ._dtype import (
5859
ToDTypeUInt16 as ToDTypeUInt16,
5960
ToDTypeUInt32 as ToDTypeUInt32,
6061
ToDTypeUInt64 as ToDTypeUInt64,
62+
ToDTypeULong as ToDTypeULong,
6163
ToDTypeVoid as ToDTypeVoid,
6264
_ToDType as _ToDType,
6365
)

src/_numtype/_dtype.pyi

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ from numpy._typing._char_codes import (
1818
_Int32Codes,
1919
_Int64Codes,
2020
_IntPCodes,
21+
_LongCodes,
2122
_LongDoubleCodes,
2223
_ObjectCodes,
2324
_StrCodes,
@@ -28,6 +29,7 @@ from numpy._typing._char_codes import (
2829
_UInt32Codes,
2930
_UInt64Codes,
3031
_UIntPCodes,
32+
_ULongCodes,
3133
_VoidCodes,
3234
)
3335
from numpy._typing._dtype_like import _VoidDTypeLike
@@ -49,6 +51,7 @@ __all__ = [
4951
"ToDTypeInt16",
5052
"ToDTypeInt32",
5153
"ToDTypeInt64",
54+
"ToDTypeLong",
5255
"ToDTypeLongDouble",
5356
"ToDTypeObject",
5457
"ToDTypeStr",
@@ -58,6 +61,7 @@ __all__ = [
5861
"ToDTypeUInt16",
5962
"ToDTypeUInt32",
6063
"ToDTypeUInt64",
64+
"ToDTypeULong",
6165
"ToDTypeVoid",
6266
"_ToDType",
6367
"_ToDType2",
@@ -105,6 +109,8 @@ ToDTypeInt32: TypeAlias = _ToDType2[np.int32, _c_i32] | _Int32Codes
105109
ToDTypeUInt32: TypeAlias = _ToDType2[np.uint32, _c_u32] | _UInt32Codes
106110
ToDTypeInt64: TypeAlias = _ToDType2[np.int64, _c_i64 | JustInt] | _Int64Codes | _IntPCodes
107111
ToDTypeUInt64: TypeAlias = _ToDType2[np.uint64, _c_u64] | _UInt64Codes | _UIntPCodes
112+
ToDTypeULong: TypeAlias = np.dtypes.ULongDType | type[ct.c_ulong] | _ULongCodes
113+
ToDTypeLong: TypeAlias = np.dtypes.LongDType | type[ct.c_long] | _LongCodes
108114
ToDTypeFloat16: TypeAlias = _ToDType[np.float16] | _Float16Codes
109115
ToDTypeFloat32: TypeAlias = _ToDType2[np.float32, ct.c_float] | _Float32Codes
110116
ToDTypeFloat64: TypeAlias = _ToDType2[np.float64, ct.c_double | JustFloat] | _Float64Codes

0 commit comments

Comments
 (0)