replace npt.NDArray with np_ndarray

Author: cmp0xff

pandas-stubs/core/groupby/groupby.pyi

@@ -64,6 +64,7 @@ from pandas._typing import (
     TimestampConvertibleTypes,
     WindowingEngine,
     WindowingEngineKwargs,
+    np_ndarray_int64,
     npt,
 )
 
@@ -357,7 +358,7 @@ class BaseGroupBy(SelectionMixin[NDFrameT], GroupByIndexingMixin):
     def ngroups(self) -> int: ...
     @final
     @property
-    def indices(self) -> dict[Hashable, Index | npt.NDArray[np.int_] | list[int]]: ...
+    def indices(self) -> dict[Hashable, Index | np_ndarray_int64 | list[int]]: ...
     @overload
     def pipe(
         self,

pandas-stubs/core/indexers.pyi

@@ -4,6 +4,7 @@ from numpy import typing as npt
 
 from pandas._typing import (
     AnyArrayLike,
+    np_1darray_bool,
 )
 
 def check_array_indexer(

pandas-stubs/core/indexes/interval.pyi

@@ -29,14 +29,17 @@ from pandas._typing import (
     np_1darray,
     np_ndarray_anyint,
     np_ndarray_bool,
+    np_ndarray_dt,
+    np_ndarray_int64,
+    np_ndarray_td,
     npt,
 )
 
 from pandas.core.dtypes.dtypes import IntervalDtype as IntervalDtype
 
 _EdgesInt: TypeAlias = (
     Sequence[int]
-    | npt.NDArray[np.int64]
+    | np_ndarray_int64
     | npt.NDArray[np.int32]
     | npt.NDArray[np.intp]
     | pd.Series[int]
@@ -46,16 +49,10 @@ _EdgesFloat: TypeAlias = (
     Sequence[float] | npt.NDArray[np.float64] | pd.Series[float] | Index[float]
 )
 _EdgesTimestamp: TypeAlias = (
-    Sequence[DatetimeLike]
-    | npt.NDArray[np.datetime64]
-    | pd.Series[pd.Timestamp]
-    | pd.DatetimeIndex
+    Sequence[DatetimeLike] | np_ndarray_dt | pd.Series[pd.Timestamp] | pd.DatetimeIndex
 )
 _EdgesTimedelta: TypeAlias = (
-    Sequence[pd.Timedelta]
-    | npt.NDArray[np.timedelta64]
-    | pd.Series[pd.Timedelta]
-    | pd.TimedeltaIndex
+    Sequence[pd.Timedelta] | np_ndarray_td | pd.Series[pd.Timedelta] | pd.TimedeltaIndex
 )
 _TimestampLike: TypeAlias = pd.Timestamp | np.datetime64 | dt.datetime
 _TimedeltaLike: TypeAlias = pd.Timedelta | np.timedelta64 | dt.timedelta

pandas-stubs/core/strings/accessor.pyi

@@ -15,7 +15,6 @@ from typing import (
 )
 
 import numpy as np
-import numpy.typing as npt
 import pandas as pd
 from pandas import (
     DataFrame,
@@ -32,6 +31,7 @@ from pandas._typing import (
     Scalar,
     T,
     np_1darray,
+    np_ndarray_str,
 )
 
 # Used for the result of str.split with expand=True
@@ -67,9 +67,7 @@ class StringMethods(
     @overload
     def cat(
         self,
-        others: (
-            Series[str] | Index[str] | pd.DataFrame | npt.NDArray[np.str_] | list[str]
-        ),
+        others: list[str] | np_ndarray_str | Series[str] | Index[str] | pd.DataFrame,
         sep: str | None = None,
         na_rep: str | None = None,
         join: AlignJoin = "left",

pandas-stubs/core/tools/datetimes.pyi

@@ -26,7 +26,9 @@ from pandas._typing import (
     IgnoreRaise,
     RaiseCoerce,
     TimestampConvertibleTypes,
-    npt,
+    np_ndarray_dt,
+    np_ndarray_int64,
+    np_ndarray_str,
 )
 
 ArrayConvertible: TypeAlias = list | tuple | AnyArrayLike
@@ -100,9 +102,9 @@ def to_datetime(
         Sequence[float | date]
         | list[str]
         | tuple[float | str | date, ...]
-        | npt.NDArray[np.datetime64]
-        | npt.NDArray[np.str_]
-        | npt.NDArray[np.int_]
+        | np_ndarray_dt
+        | np_ndarray_str
+        | np_ndarray_int64
         | Index
         | ExtensionArray
     ),

pandas-stubs/io/formats/style.pyi

@@ -11,7 +11,6 @@ from typing import (
 )
 
 from matplotlib.colors import Colormap
-import numpy as np
 from pandas.core.frame import DataFrame
 from pandas.core.series import Series
 
@@ -31,6 +30,7 @@ from pandas._typing import (
     T,
     WriteBuffer,
     WriteExcelBuffer,
+    np_ndarray_str,
     npt,
 )
 
@@ -245,7 +245,7 @@ class Styler(StylerRenderer):
     ) -> Styler: ...
     def apply_index(
         self,
-        func: Callable[[Series], npt.NDArray[np.str_] | list[str] | Series[str]],
+        func: Callable[[Series], list[str] | np_ndarray_str | Series[str]],
         axis: Axis = ...,
         level: Level | list[Level] | None = ...,
         **kwargs: Any,

tests/__init__.py

@@ -53,6 +53,7 @@
         np_ndarray_bool as np_ndarray_bool,
         np_ndarray_dt as np_ndarray_dt,
         np_ndarray_int as np_ndarray_int,
+        np_ndarray_str as np_ndarray_str,
         np_ndarray_td as np_ndarray_td,
     )
 else:
@@ -69,6 +70,7 @@
     np_ndarray_dt: TypeAlias = npt.NDArray[np.datetime64]
     np_ndarray_int: TypeAlias = npt.NDArray[np.signedinteger]
     np_ndarray_int64: TypeAlias = npt.NDArray[np.int64]
+    np_ndarray_str: TypeAlias = npt.NDArray[np.str_]
     np_ndarray_td: TypeAlias = npt.NDArray[np.timedelta64]
 
 TYPE_CHECKING_INVALID_USAGE: Final = TYPE_CHECKING

tests/indexes/test_indexes.py

@@ -10,7 +10,6 @@
 )
 
 import numpy as np
-from numpy import typing as npt
 import pandas as pd
 from pandas.core.arrays.base import ExtensionArray
 from pandas.core.arrays.categorical import Categorical
@@ -30,6 +29,7 @@
     TYPE_CHECKING_INVALID_USAGE,
     check,
     np_1darray,
+    np_ndarray_dt,
     pytest_warns_bounded,
 )
 
@@ -647,7 +647,7 @@ def test_interval_index_arrays() -> None:
         pd.IntervalIndex,
         pd.Interval,
     )
-    left_dt64_arr: npt.NDArray[np.datetime64] = np.array(
+    left_dt64_arr: np_ndarray_dt = np.array(
         [
             np.datetime64("2000-01-01"),
             np.datetime64("2001-01-01"),
@@ -656,7 +656,7 @@ def test_interval_index_arrays() -> None:
         ],
         dtype="datetime64[ns]",
     )
-    right_dt_arr: npt.NDArray[np.datetime64] = np.array(
+    right_dt_arr: np_ndarray_dt = np.array(
         [
             np.datetime64("2001-01-01"),
             np.datetime64("2002-01-01"),

tests/scalars/test_scalars.py

@@ -534,9 +534,7 @@ def test_timedelta_add_sub() -> None:
     check(assert_type(td + as_timedelta_index, pd.TimedeltaIndex), pd.TimedeltaIndex)
     check(assert_type(td + as_period_index, pd.PeriodIndex), pd.PeriodIndex)
     check(assert_type(td + as_datetime_index, pd.DatetimeIndex), pd.DatetimeIndex)
-    check(
-        assert_type(td + as_ndarray_td64, np_ndarray_td), np_ndarray_td, np.timedelta64
-    )
+    check(assert_type(td + as_ndarray_td64, np_ndarray_td), np_ndarray, np.timedelta64)
     check(assert_type(td + as_ndarray_dt64, np_ndarray_dt), np_ndarray, np.datetime64)
     check(assert_type(td + as_nat, NaTType), NaTType)
 
@@ -586,9 +584,7 @@ def test_timedelta_add_sub() -> None:
     check(assert_type(td - as_dt_timedelta, pd.Timedelta), pd.Timedelta)
     check(assert_type(td - as_timedelta64, pd.Timedelta), pd.Timedelta)
     check(assert_type(td - as_timedelta_index, pd.TimedeltaIndex), pd.TimedeltaIndex)
-    check(
-        assert_type(td - as_ndarray_td64, np_ndarray_td), np_ndarray_td, np.timedelta64
-    )
+    check(assert_type(td - as_ndarray_td64, np_ndarray_td), np_ndarray, np.timedelta64)
     check(assert_type(td - as_nat, NaTType), NaTType)
     check(assert_type(as_period - td, pd.Period), pd.Period)
     check(assert_type(as_timestamp - td, pd.Timestamp), pd.Timestamp)
@@ -1093,14 +1089,10 @@ def test_timestamp_add_sub() -> None:
     )
 
     check(
-        assert_type(ts + as_np_ndarray_td64, np_ndarray_dt),
-        np_ndarray_dt,
-        np.datetime64,
+        assert_type(ts + as_np_ndarray_td64, np_ndarray_dt), np_ndarray, np.datetime64
     )
     check(
-        assert_type(as_np_ndarray_td64 + ts, np_ndarray_dt),
-        np_ndarray_dt,
-        np.datetime64,
+        assert_type(as_np_ndarray_td64 + ts, np_ndarray_dt), np_ndarray, np.datetime64
     )
 
     # Reverse order is not possible for all of these
@@ -1114,9 +1106,7 @@ def test_timestamp_add_sub() -> None:
         pd.Timestamp,
     )
     check(
-        assert_type(ts - as_np_ndarray_td64, np_ndarray_dt),
-        np_ndarray_dt,
-        np.datetime64,
+        assert_type(ts - as_np_ndarray_td64, np_ndarray_dt), np_ndarray, np.datetime64
     )
 
 

tests/test_styler.py

@@ -9,7 +9,6 @@
 )
 from jinja2.loaders import PackageLoader
 import numpy as np
-import numpy.typing as npt
 from pandas import (
     DataFrame,
     Index,
@@ -24,6 +23,7 @@
     PD_LTE_23,
     check,
     ensure_clean,
+    np_ndarray_str,
 )
 
 from pandas.io.formats.style import Styler
@@ -64,7 +64,7 @@ def highlight_max(x: Series[int], /, color: str) -> list[str]:
 
 
 def test_apply_index() -> None:
-    def f(s: Series) -> npt.NDArray[np.str_]:
+    def f(s: Series) -> np_ndarray_str:
         return np.asarray(s, dtype=np.str_)
 
     check(assert_type(DF.style.apply_index(f), Styler), Styler)