use np_ndarray_intp, np_ndarray_int64, np_ndarray_float aliases more (#1513)

Author: MarcoGorelli

pandas-stubs/core/groupby/ops.pyi

@@ -5,17 +5,15 @@ from typing import (
     Generic,
 )
 
-import numpy as np
-
 from pandas._typing import (
     AxisInt,
     NDFrameT,
-    npt,
+    np_ndarray_intp,
 )
 
 class DataSplitter(Generic[NDFrameT]):
     data: NDFrameT
-    labels: npt.NDArray[np.intp]
+    labels: np_ndarray_intp
     ngroups: int
     axis: AxisInt
     def __iter__(self) -> Iterator[NDFrameT]: ...

pandas-stubs/core/indexes/interval.pyi

@@ -31,6 +31,7 @@ from pandas._typing import (
     np_ndarray_bool,
     np_ndarray_dt,
     np_ndarray_int64,
+    np_ndarray_intp,
     np_ndarray_td,
     npt,
 )
@@ -41,7 +42,7 @@ _EdgesInt: TypeAlias = (
     Sequence[int]
     | np_ndarray_int64
     | npt.NDArray[np.int32]
-    | npt.NDArray[np.intp]
+    | np_ndarray_intp
     | pd.Series[int]
     | Index[int]
 )

tests/__init__.py

@@ -68,9 +68,12 @@
         np_1darray_td as np_1darray_td,
         np_2darray as np_2darray,
         np_ndarray as np_ndarray,
+        np_ndarray_anyint as np_ndarray_anyint,
         np_ndarray_bool as np_ndarray_bool,
         np_ndarray_dt as np_ndarray_dt,
+        np_ndarray_float as np_ndarray_float,
         np_ndarray_int as np_ndarray_int,
+        np_ndarray_int64 as np_ndarray_int64,
         np_ndarray_intp as np_ndarray_intp,
         np_ndarray_num as np_ndarray_num,
         np_ndarray_str as np_ndarray_str,
@@ -457,6 +460,8 @@
     np_ndarray_int: TypeAlias = npt.NDArray[np.signedinteger]
     np_ndarray_intp: TypeAlias = npt.NDArray[np.intp]
     np_ndarray_int64: TypeAlias = npt.NDArray[np.int64]
+    np_ndarray_anyint: TypeAlias = npt.NDArray[np.integer]
+    np_ndarray_float: TypeAlias = npt.NDArray[np.floating]
     np_ndarray_num: TypeAlias = npt.NDArray[np.number]
     np_ndarray_str: TypeAlias = npt.NDArray[np.str_]
     np_ndarray_td: TypeAlias = npt.NDArray[np.timedelta64]

tests/indexes/arithmetic/bool/test_add.py

@@ -3,7 +3,10 @@
 import pandas as pd
 from typing_extensions import assert_type
 
-from tests import check
+from tests import (
+    check,
+    np_ndarray_int64,
+)
 
 # left operand
 left = pd.Index([True, True, False])
@@ -55,7 +58,7 @@ def test_add_numpy_array() -> None:
     # checking, where our `__radd__` cannot override. At runtime, they return
     # `Index`es with the correct element type.
     check(assert_type(b + left, "npt.NDArray[np.bool_]"), pd.Index, np.bool_)
-    check(assert_type(i + left, "npt.NDArray[np.int64]"), pd.Index, np.integer)
+    check(assert_type(i + left, np_ndarray_int64), pd.Index, np.integer)
     check(assert_type(f + left, "npt.NDArray[np.float64]"), pd.Index, np.floating)
     check(
         assert_type(c + left, "npt.NDArray[np.complex128]"),

tests/indexes/arithmetic/bool/test_mul.py

@@ -16,6 +16,7 @@
 from tests import (
     TYPE_CHECKING_INVALID_USAGE,
     check,
+    np_ndarray_int64,
 )
 
 
@@ -92,7 +93,7 @@ def test_mul_numpy_array(left: "pd.Index[bool]") -> None:
     # checking, where our `__rmul__` cannot override. At runtime, they return
     # `Index` with the correct element type.
     check(assert_type(b * left, "npt.NDArray[np.bool_]"), pd.Index, np.bool_)
-    check(assert_type(i * left, "npt.NDArray[np.int64]"), pd.Index, np.integer)
+    check(assert_type(i * left, np_ndarray_int64), pd.Index, np.integer)
     check(assert_type(f * left, "npt.NDArray[np.float64]"), pd.Index, np.floating)
     check(
         assert_type(c * left, "npt.NDArray[np.complex128]"),

tests/indexes/arithmetic/bool/test_sub.py

@@ -9,6 +9,7 @@
 from tests import (
     TYPE_CHECKING_INVALID_USAGE,
     check,
+    np_ndarray_int64,
 )
 
 left = pd.Index([True, True, False])  # left operand
@@ -66,7 +67,7 @@ def test_sub_numpy_array() -> None:
     # `Index`es with the correct element type.
     if TYPE_CHECKING_INVALID_USAGE:
         assert_type(b - left, Never)
-    check(assert_type(i - left, "npt.NDArray[np.int64]"), pd.Index, np.integer)
+    check(assert_type(i - left, np_ndarray_int64), pd.Index, np.integer)
     check(assert_type(f - left, "npt.NDArray[np.float64]"), pd.Index, np.floating)
     check(
         assert_type(c - left, "npt.NDArray[np.complex128]"),

tests/indexes/arithmetic/complex/test_add.py

@@ -3,7 +3,10 @@
 import pandas as pd
 from typing_extensions import assert_type
 
-from tests import check
+from tests import (
+    check,
+    np_ndarray_int64,
+)
 
 # left operand
 left = pd.Index([1j, 2j, 3j])
@@ -55,7 +58,7 @@ def test_add_numpy_array() -> None:
     # checking, where our `__radd__` cannot override. At runtime, they return
     # `Index`es with the correct element type.
     check(assert_type(b + left, "npt.NDArray[np.bool_]"), pd.Index, np.complexfloating)
-    check(assert_type(i + left, "npt.NDArray[np.int64]"), pd.Index, np.complexfloating)
+    check(assert_type(i + left, np_ndarray_int64), pd.Index, np.complexfloating)
     check(
         assert_type(f + left, "npt.NDArray[np.float64]"), pd.Index, np.complexfloating
     )

tests/indexes/arithmetic/complex/test_mul.py

@@ -16,6 +16,7 @@
 from tests import (
     TYPE_CHECKING_INVALID_USAGE,
     check,
+    np_ndarray_int64,
 )
 
 
@@ -92,7 +93,7 @@ def test_mul_numpy_array(left: "pd.Index[complex]") -> None:
     # checking, where our `__rmul__` cannot override. At runtime, they return
     # `Index` with the correct element type.
     check(assert_type(b * left, "npt.NDArray[np.bool_]"), pd.Index, np.complexfloating)
-    check(assert_type(i * left, "npt.NDArray[np.int64]"), pd.Index, np.complexfloating)
+    check(assert_type(i * left, np_ndarray_int64), pd.Index, np.complexfloating)
     check(
         assert_type(f * left, "npt.NDArray[np.float64]"), pd.Index, np.complexfloating
     )

tests/indexes/arithmetic/complex/test_sub.py

@@ -5,7 +5,10 @@
 import pandas as pd
 from typing_extensions import assert_type
 
-from tests import check
+from tests import (
+    check,
+    np_ndarray_int64,
+)
 
 # left operand
 left = pd.Index([1j, 2j, 3j])
@@ -57,7 +60,7 @@ def test_sub_numpy_array() -> None:
     # checking, where our `__rsub__` cannot override. At runtime, they return
     # `Index`es with the correct element type.
     check(assert_type(b - left, NoReturn), pd.Index, np.complexfloating)
-    check(assert_type(i - left, "npt.NDArray[np.int64]"), pd.Index, np.complexfloating)
+    check(assert_type(i - left, np_ndarray_int64), pd.Index, np.complexfloating)
     check(
         assert_type(f - left, "npt.NDArray[np.float64]"), pd.Index, np.complexfloating
     )

tests/indexes/arithmetic/float/test_add.py

@@ -3,7 +3,10 @@
 import pandas as pd
 from typing_extensions import assert_type
 
-from tests import check
+from tests import (
+    check,
+    np_ndarray_int64,
+)
 
 # left operand
 left = pd.Index([1.0, 2.0, 3.0])
@@ -55,7 +58,7 @@ def test_add_numpy_array() -> None:
     # checking, where our `__radd__` cannot override. At runtime, they return
     # `Index`es with the correct element type.
     check(assert_type(b + left, "npt.NDArray[np.bool_]"), pd.Index, np.floating)
-    check(assert_type(i + left, "npt.NDArray[np.int64]"), pd.Index, np.floating)
+    check(assert_type(i + left, np_ndarray_int64), pd.Index, np.floating)
     check(assert_type(f + left, "npt.NDArray[np.float64]"), pd.Index, np.floating)
     check(
         assert_type(c + left, "npt.NDArray[np.complex128]"),