diff options
| author | Sebastian Berg <sebastian@sipsolutions.net> | 2022-01-10 19:50:39 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-10 19:50:39 -0600 |
| commit | abd47fc824ca9cdd2c03063b5d294039a2f6f0d1 (patch) | |
| tree | 3420632c97fd796f75765084c7129a2a29cd4aa8 /numpy | |
| parent | 18aa14c0aa699506bea357f46a18cbdfabc3d951 (diff) | |
| parent | 156d8c3394ef1724034c2d9432ea9b89693d8582 (diff) | |
| download | numpy-abd47fc824ca9cdd2c03063b5d294039a2f6f0d1.tar.gz | |
Merge pull request #20779 from gdementen/remove-duplicate-int-type
MAINT: removed duplicate 'int' type in ScalarType
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/numerictypes.py | 2 | ||||
| -rw-r--r-- | numpy/core/numerictypes.pyi | 1 | ||||
| -rw-r--r-- | numpy/typing/tests/data/pass/numerictypes.py | 6 | ||||
| -rw-r--r-- | numpy/typing/tests/data/reveal/numerictypes.pyi | 6 |
4 files changed, 7 insertions, 8 deletions
diff --git a/numpy/core/numerictypes.py b/numpy/core/numerictypes.py index 8e5de852b..3d1cb6fd1 100644 --- a/numpy/core/numerictypes.py +++ b/numpy/core/numerictypes.py @@ -516,7 +516,7 @@ def _scalar_type_key(typ): return (dt.kind.lower(), dt.itemsize) -ScalarType = [int, float, complex, int, bool, bytes, str, memoryview] +ScalarType = [int, float, complex, bool, bytes, str, memoryview] ScalarType += sorted(_concrete_types, key=_scalar_type_key) ScalarType = tuple(ScalarType) diff --git a/numpy/core/numerictypes.pyi b/numpy/core/numerictypes.pyi index f8c49b957..09c180a0f 100644 --- a/numpy/core/numerictypes.pyi +++ b/numpy/core/numerictypes.pyi @@ -137,7 +137,6 @@ ScalarType: tuple[ type[int], type[float], type[complex], - type[int], type[bool], type[bytes], type[str], diff --git a/numpy/typing/tests/data/pass/numerictypes.py b/numpy/typing/tests/data/pass/numerictypes.py index 5af0d171c..7f1dd0945 100644 --- a/numpy/typing/tests/data/pass/numerictypes.py +++ b/numpy/typing/tests/data/pass/numerictypes.py @@ -38,9 +38,9 @@ np.nbytes[np.int64] np.ScalarType np.ScalarType[0] -np.ScalarType[4] -np.ScalarType[9] -np.ScalarType[11] +np.ScalarType[3] +np.ScalarType[8] +np.ScalarType[10] np.typecodes["Character"] np.typecodes["Complex"] diff --git a/numpy/typing/tests/data/reveal/numerictypes.pyi b/numpy/typing/tests/data/reveal/numerictypes.pyi index cc2335264..e1857557d 100644 --- a/numpy/typing/tests/data/reveal/numerictypes.pyi +++ b/numpy/typing/tests/data/reveal/numerictypes.pyi @@ -33,9 +33,9 @@ reveal_type(np.nbytes[np.int64]) # E: int reveal_type(np.ScalarType) # E: Tuple reveal_type(np.ScalarType[0]) # E: Type[builtins.int] -reveal_type(np.ScalarType[4]) # E: Type[builtins.bool] -reveal_type(np.ScalarType[9]) # E: Type[{csingle}] -reveal_type(np.ScalarType[11]) # E: Type[{clongdouble}] +reveal_type(np.ScalarType[3]) # E: Type[builtins.bool] +reveal_type(np.ScalarType[8]) # E: Type[{csingle}] +reveal_type(np.ScalarType[10]) # E: Type[{clongdouble}] reveal_type(np.typecodes["Character"]) # E: Literal['c'] reveal_type(np.typecodes["Complex"]) # E: Literal['FDG'] |