refactor(ruff): ANN002

cmp0xff · cmp0xff · commit ac3c0a630a84 · 2025-10-08T16:50:03.000+02:00
diff --git a/pandas-stubs/_testing/__init__.pyi b/pandas-stubs/_testing/__init__.pyi
@@ -176,7 +176,7 @@ def assert_frame_equal(
 def assert_equal(left, right, **kwargs: Any) -> None: ...
 def assert_sp_array_equal(left: SparseArray, right: SparseArray) -> None: ...
 def assert_contains_all(iterable: Iterable[T], dic: Container[T]) -> None: ...
-def assert_copy(iter1: Iterable[T], iter2: Iterable[T], **eql_kwargs) -> None: ...
+def assert_copy(iter1: Iterable[T], iter2: Iterable[T], **eql_kwargs: Any) -> None: ...
 @contextmanager
 def assert_produces_warning(
     expected_warning: (
diff --git a/pandas-stubs/core/arrays/base.pyi b/pandas-stubs/core/arrays/base.pyi
@@ -21,6 +21,8 @@ from pandas._typing import (
 from pandas.core.dtypes.dtypes import ExtensionDtype as ExtensionDtype
 
 class ExtensionArray:
+    def __array__(self, dtype=...) -> np_1darray: ...
+    def __array_ufunc__(self, ufunc, method, *inputs: Any, **kwargs: Any): ...
     @overload
     def __getitem__(self, item: ScalarIndexer) -> Any: ...
     @overload
diff --git a/pandas-stubs/core/arrays/boolean.pyi b/pandas-stubs/core/arrays/boolean.pyi
@@ -20,7 +20,6 @@ class BooleanArray(BaseMaskedArray):
     ) -> None: ...
     @property
     def dtype(self): ...
-    def __array_ufunc__(self, ufunc, method, *inputs, **kwargs: Any): ...
     def __setitem__(self, key, value) -> None: ...
     def astype(self, dtype, copy: bool = True): ...
     def any(self, *, skipna: bool = ..., **kwargs: Any): ...
diff --git a/pandas-stubs/core/arrays/categorical.pyi b/pandas-stubs/core/arrays/categorical.pyi
@@ -89,8 +89,6 @@ class Categorical(ExtensionArray):
     @property
     def shape(self): ...
     def shift(self, periods=1, fill_value=...): ...
-    def __array__(self, dtype=...) -> np_1darray: ...
-    def __array_ufunc__(self, ufunc, method, *inputs, **kwargs: Any): ...
     @property
     def T(self): ...
     @property
@@ -112,7 +110,6 @@ class Categorical(ExtensionArray):
     def take(
         self, indexer: TakeIndexer, *, allow_fill: bool = ..., fill_value=...
     ) -> Categorical: ...
-    def __len__(self) -> int: ...
     def __iter__(self): ...
     def __contains__(self, key) -> bool: ...
     @overload
diff --git a/pandas-stubs/core/arrays/datetimelike.pyi b/pandas-stubs/core/arrays/datetimelike.pyi
@@ -66,10 +66,8 @@ class DatetimeLikeArrayMixin(ExtensionOpsMixin, ExtensionArray):
     def asi8(self) -> np.ndarray: ...
     @property
     def nbytes(self): ...
-    def __array__(self, dtype=...) -> np.ndarray: ...
     @property
     def size(self) -> int: ...
-    def __len__(self) -> int: ...
     @overload
     def __getitem__(self, key: ScalarIndexer) -> DTScalarOrNaT: ...
     @overload
diff --git a/pandas-stubs/core/arrays/datetimes.pyi b/pandas-stubs/core/arrays/datetimes.pyi
@@ -29,7 +29,6 @@ class DatetimeArray(DatetimeLikeArrayMixin, TimelikeOps, DatelikeOps):
     def tzinfo(self) -> _tzinfo | None: ...
     @property
     def is_normalized(self): ...
-    def __array__(self, dtype=...) -> np.ndarray: ...
     def __iter__(self): ...
     def astype(self, dtype, copy: bool = True): ...
     def tz_convert(self, tz: TimeZones): ...
diff --git a/pandas-stubs/core/arrays/integer.pyi b/pandas-stubs/core/arrays/integer.pyi
@@ -1,5 +1,3 @@
-from typing import Any
-
 from pandas.core.arrays.masked import BaseMaskedArray
 
 from pandas._libs.missing import NAType
@@ -19,7 +17,6 @@ class IntegerArray(BaseMaskedArray):
     @property
     def dtype(self) -> _IntegerDtype: ...
     def __init__(self, values, mask, copy: bool = ...) -> None: ...
-    def __array_ufunc__(self, ufunc, method, *inputs, **kwargs: Any): ...
     def __setitem__(self, key, value) -> None: ...
     def astype(self, dtype, copy: bool = True): ...
 
diff --git a/pandas-stubs/core/arrays/interval.pyi b/pandas-stubs/core/arrays/interval.pyi
@@ -58,7 +58,6 @@ class IntervalArray(IntervalMixin, ExtensionArray):
         dtype=None,
     ): ...
     def __iter__(self): ...
-    def __len__(self) -> int: ...
     @overload
     def __getitem__(self, key: ScalarIndexer) -> IntervalOrNA: ...
     @overload
@@ -100,7 +99,6 @@ class IntervalArray(IntervalMixin, ExtensionArray):
     def mid(self) -> Index: ...
     @property
     def is_non_overlapping_monotonic(self) -> bool: ...
-    def __array__(self, dtype=...) -> np_1darray: ...
     def __arrow_array__(self, type=...): ...
     def to_tuples(self, na_tuple: bool = True): ...
     def repeat(self, repeats, axis: Axis | None = ...): ...
diff --git a/pandas-stubs/core/arrays/masked.pyi b/pandas-stubs/core/arrays/masked.pyi
@@ -23,7 +23,6 @@ class BaseMaskedArray(ExtensionArray, ExtensionOpsMixin):
     @overload
     def __getitem__(self, item: SequenceIndexer) -> Self: ...
     def __iter__(self): ...
-    def __len__(self) -> int: ...
     def __invert__(self): ...
     def to_numpy(
         self,
@@ -32,7 +31,6 @@ class BaseMaskedArray(ExtensionArray, ExtensionOpsMixin):
         na_value: Scalar = ...,
     ) -> np.ndarray: ...
     __array_priority__: int = ...
-    def __array__(self, dtype=...) -> np.ndarray: ...
     def __arrow_array__(self, type=...): ...
     def isna(self): ...
     @property
diff --git a/pandas-stubs/core/arrays/numpy_.pyi b/pandas-stubs/core/arrays/numpy_.pyi
@@ -1,5 +1,3 @@
-from typing import Any
-
 import numpy as np
 from numpy.lib.mixins import NDArrayOperatorsMixin
 from pandas.core.arrays.base import (
@@ -15,5 +13,4 @@ class PandasDtype(ExtensionDtype):
     @property
     def itemsize(self) -> int: ...
 
-class PandasArray(ExtensionArray, ExtensionOpsMixin, NDArrayOperatorsMixin):
-    def __array_ufunc__(self, ufunc, method, *inputs, **kwargs: Any): ...
+class PandasArray(ExtensionArray, ExtensionOpsMixin, NDArrayOperatorsMixin): ...
diff --git a/pandas-stubs/core/arrays/period.pyi b/pandas-stubs/core/arrays/period.pyi
@@ -1,4 +1,3 @@
-import numpy as np
 from pandas import PeriodDtype
 from pandas.core.arrays.datetimelike import (
     DatelikeOps,
@@ -13,7 +12,6 @@ class PeriodArray(DatetimeLikeArrayMixin, DatelikeOps):
     def __init__(self, values, freq=..., dtype=..., copy: bool = ...) -> None: ...
     @property
     def dtype(self) -> PeriodDtype: ...
-    def __array__(self, dtype=...) -> np.ndarray: ...
     def __arrow_array__(self, type=...): ...
     year: int = ...
     month: int = ...
diff --git a/pandas-stubs/core/arrays/sparse/array.pyi b/pandas-stubs/core/arrays/sparse/array.pyi
@@ -5,7 +5,6 @@ from typing import (
     overload,
 )
 
-import numpy as np
 from pandas.core.arrays import (
     ExtensionArray,
     ExtensionOpsMixin,
@@ -33,7 +32,7 @@ class SparseArray(ExtensionArray, ExtensionOpsMixin):
     ) -> None: ...
     @classmethod
     def from_spmatrix(cls, data): ...
-    def __array__(self, dtype=..., copy=...) -> np.ndarray: ...
+    def __array__(self, dtype=..., copy=...): ...
     def __setitem__(self, key, value) -> None: ...
     @property
     def sp_index(self): ...
@@ -47,7 +46,6 @@ class SparseArray(ExtensionArray, ExtensionOpsMixin):
     def fill_value(self, value) -> None: ...
     @property
     def kind(self) -> str: ...
-    def __len__(self) -> int: ...
     @property
     def nbytes(self) -> int: ...
     @property
@@ -78,5 +76,4 @@ class SparseArray(ExtensionArray, ExtensionOpsMixin):
     def mean(self, axis: int = ..., *args: Any, **kwargs: Any): ...
     @property
     def T(self): ...
-    def __array_ufunc__(self, ufunc, method, *inputs, **kwargs: Any): ...
     def __abs__(self): ...
diff --git a/pandas-stubs/core/indexes/category.pyi b/pandas-stubs/core/indexes/category.pyi
@@ -13,6 +13,7 @@ from typing_extensions import Self
 from pandas._typing import (
     S1,
     DtypeArg,
+    np_1darray,
 )
 
 class CategoricalIndex(ExtensionIndex[S1], accessor.PandasDelegate):
@@ -35,7 +36,7 @@ class CategoricalIndex(ExtensionIndex[S1], accessor.PandasDelegate):
     def __contains__(self, key) -> bool: ...
     def __array__(
         self, dtype: DtypeArg = ..., copy: bool | None = ...
-    ) -> np.ndarray: ...
+    ) -> np_1darray: ...
     @property
     def is_unique(self) -> bool: ...
     @property
diff --git a/pandas-stubs/core/indexes/range.pyi b/pandas-stubs/core/indexes/range.pyi
@@ -74,7 +74,6 @@ class RangeIndex(_IndexSubclassBase[int, np.int64]):
         return_indexers: bool = ...,
         sort: bool = ...,
     ): ...
-    def __len__(self) -> int: ...
     @property
     def size(self) -> int: ...
     def __floordiv__(self, other): ...
diff --git a/pandas-stubs/plotting/_misc.pyi b/pandas-stubs/plotting/_misc.pyi
@@ -49,7 +49,7 @@ def radviz(
     ax: Axes | None = None,
     color: _Color | Sequence[_Color] | None = None,
     colormap: str | Colormap | None = None,
-    **kwds,
+    **kwds: Any,
 ) -> Axes: ...
 def andrews_curves(
     frame: DataFrame,
@@ -65,7 +65,7 @@ def bootstrap_plot(
     fig: Figure | None = None,
     size: int = 50,
     samples: int = 500,
-    **kwds,
+    **kwds: Any,
 ) -> Figure: ...
 def parallel_coordinates(
     frame: DataFrame,
@@ -81,7 +81,9 @@ def parallel_coordinates(
     sort_labels: bool = False,
     **kwargs: Any,
 ) -> Axes: ...
-def lag_plot(series: Series, lag: int = 1, ax: Axes | None = None, **kwds) -> Axes: ...
+def lag_plot(
+    series: Series, lag: int = 1, ax: Axes | None = None, **kwds: Any
+) -> Axes: ...
 def autocorrelation_plot(
     series: Series, ax: Axes | None = None, **kwargs: Any
 ) -> Axes: ...
diff --git a/pyproject.toml b/pyproject.toml
@@ -200,7 +200,7 @@ ignore = [
   "PYI001",  # https://docs.astral.sh/ruff/rules/unprefixed-type-param/
   "PYI042",  # https://docs.astral.sh/ruff/rules/snake-case-type-alias/
   "TD003",   # https://docs.astral.sh/ruff/rules/missing-todo-link/
-  "ERA001", "ANN", "PLR0402", "PLC0105"
+  "ERA001", "ANN001", "ANN201", "ANN202", "ANN204", "ANN206", "ANN401", "PLR0402", "PLC0105"
   ]
 "scripts/*" = [
   # The following rules are ignored permanently for good reasons
@@ -223,7 +223,7 @@ ignore = [
   "A001",    # https://docs.astral.sh/ruff/rules/builtin-variable-shadowing/
   "PYI042",  # https://docs.astral.sh/ruff/rules/snake-case-type-alias/
   "SLF001",  # https://docs.astral.sh/ruff/rules/private-member-access/
-  "ANN001", "ANN002", "ANN201", "ANN202", "ANN204", "ANN206", "ANN401", "ARG", "ERA", "RUF", "SIM", "TRY", "PT", "NPY", "N", "DTZ", "PLR", "TC", "PGH", "PTH", "S311", "C901"
+  "ANN001", "ANN201", "ANN202", "ANN204", "ANN206", "ANN401", "ARG", "ERA", "RUF", "SIM", "TRY", "PT", "NPY", "N", "DTZ", "PLR", "TC", "PGH", "PTH", "S311", "C901"
 ]
 "tests/test_io.py" = [
   # The following rules are ignored permanently for good reasons
diff --git a/tests/extension/decimal/array.py b/tests/extension/decimal/array.py
@@ -125,7 +125,9 @@ def to_numpy(
             result = np.asarray([round(x, decimals) for x in result])
         return result
 
-    def __array_ufunc__(self, ufunc: np.ufunc, method: str, *inputs, **kwargs: Any):
+    def __array_ufunc__(
+        self, ufunc: np.ufunc, method: str, *inputs: Any, **kwargs: Any
+    ):
         #
         if not all(
             isinstance(t, self._HANDLED_TYPES + (DecimalArray,)) for t in inputs
diff --git a/tests/series/test_series.py b/tests/series/test_series.py
@@ -73,6 +73,8 @@
 )
 
 if TYPE_CHECKING:
+    from _typeshed import SupportsMul
+
     from tests import (
         BooleanDtypeArg,
         BytesDtypeArg,
@@ -110,6 +112,9 @@
     "T",  # unicode-string (variable-width)
 ]
 
+T = TypeVar("T")
+T_co = TypeVar("T_co", covariant=True)
+
 
 def test_types_init() -> None:
     pd.Series(1)
@@ -2125,7 +2130,6 @@ def test_AnyArrayLike_and_clip() -> None:
 
 def test_pandera_generic() -> None:
     # GH 471
-    T = TypeVar("T")
 
     class MySeries(pd.Series, Generic[T]):
         def __new__(cls, *args: Any, **kwargs: Any) -> Self:
@@ -3151,7 +3155,7 @@ def test_series_to_string_float_fmt() -> None:
     )
     check(assert_type(sr.to_string(), str), str)
 
-    def _formatter(x) -> str:
+    def _formatter(x: float) -> str:
         return f"{x:.2f}"
 
     check(assert_type(sr.to_string(float_format=_formatter), str), str)
@@ -3178,7 +3182,7 @@ def cond(x: int) -> bool:
     check(assert_type(s.mask(cond, 10), "pd.Series[int]"), pd.Series, np.integer)
 
     # Test case with a boolean condition and a callable
-    def double(x):
+    def double(x: SupportsMul[int, T_co]) -> T_co:
         return x * 2
 
     check(assert_type(s.mask(s > 3, double), "pd.Series[int]"), pd.Series, np.integer)
diff --git a/tests/test_frame.py b/tests/test_frame.py
@@ -25,6 +25,7 @@
     TYPE_CHECKING,
     Any,
     Generic,
+    Protocol,
     TypeAlias,
     TypedDict,
     TypeVar,
@@ -82,15 +83,15 @@
 DF = pd.DataFrame(data={"col1": [1, 2], "col2": [3, 4]})
 
 
-def getCols(k) -> str:
+def getCols(k: int) -> str:
     return string.ascii_uppercase[:k]
 
 
 def makeStringIndex(k: int = 10) -> pd.Index:
     return pd.Index(rands_array(nchars=10, size=k), name=None)
 
 
-def rands_array(nchars, size: int) -> np.ndarray:
+def rands_array(nchars: int, size: int) -> npt.NDArray[Any]:
     chars = np.array(list(string.ascii_letters + string.digits), dtype=(np.str_, 1))
     retval = (
         np.random.default_rng(2)
@@ -1712,7 +1713,12 @@ def test_types_groupby_agg() -> None:
     agg_dict1 = {"col2": "min", "col3": "max", 0: "sum"}
     check(assert_type(df.groupby("col1").agg(agg_dict1), pd.DataFrame), pd.DataFrame)
 
-    def wrapped_min(x: Any) -> Any:
+    T_co = TypeVar("T_co", covariant=True)
+
+    class SupportsMin(Protocol[T_co]):
+        def min(self) -> T_co: ...
+
+    def wrapped_min(x: SupportsMin[T_co]) -> T_co:
         return x.min()
 
     with pytest_warns_bounded(
@@ -2142,7 +2148,7 @@ def test_dataframe_to_string_float_fmt() -> None:
     )
     check(assert_type(df.to_string(), str), str)
 
-    def _formatter(x) -> str:
+    def _formatter(x: float) -> str:
         return f"{x:.2f}"
 
     check(assert_type(df.to_string(float_format=_formatter), str), str)
diff --git a/tests/test_plotting.py b/tests/test_plotting.py
