Make IndexOpsMixin (and Index) generic

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
     hooks:
     -   id: isort
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.0.278
+    rev: v0.0.282
     hooks:
     -   id: ruff
         args: [

pandas-stubs/_libs/tslibs/timedeltas.pyi

@@ -11,14 +11,11 @@ import numpy as np
 import pandas as pd
 from pandas import (
     DatetimeIndex,
+    Index,
     PeriodIndex,
     Series,
     TimedeltaIndex,
 )
-from pandas.core.indexes.base import (
-    _FloatIndexType,
-    _IntIndexType,
-)
 from pandas.core.series import (
     TimedeltaSeries,
     TimestampSeries,
@@ -245,7 +242,7 @@ class Timedelta(timedelta):
     @overload
     def __mul__(self, other: Series[float]) -> TimedeltaSeries: ...
     @overload
-    def __mul__(self, other: _IntIndexType | _FloatIndexType) -> TimedeltaIndex: ...
+    def __mul__(self, other: Index[int] | Index[float]) -> TimedeltaIndex: ...
     @overload
     def __rmul__(self, other: float) -> Timedelta: ...
     @overload
@@ -255,7 +252,7 @@ class Timedelta(timedelta):
     @overload
     def __rmul__(self, other: Series[float]) -> TimedeltaSeries: ...
     @overload
-    def __rmul__(self, other: _IntIndexType | _FloatIndexType) -> TimedeltaIndex: ...
+    def __rmul__(self, other: Index[int] | Index[float]) -> TimedeltaIndex: ...
     # Override due to more types supported than dt.timedelta
     # error: Signature of "__floordiv__" incompatible with supertype "timedelta"
     @overload  # type: ignore[override]
@@ -271,9 +268,7 @@ class Timedelta(timedelta):
         self, other: npt.NDArray[np.timedelta64]
     ) -> npt.NDArray[np.int_]: ...
     @overload
-    def __floordiv__(
-        self, other: _IntIndexType | _FloatIndexType
-    ) -> TimedeltaIndex: ...
+    def __floordiv__(self, other: Index[int] | Index[float]) -> TimedeltaIndex: ...
     @overload
     def __floordiv__(self, other: Series[int]) -> TimedeltaSeries: ...
     @overload
@@ -306,7 +301,7 @@ class Timedelta(timedelta):
     @overload
     def __truediv__(self, other: Series[float]) -> TimedeltaSeries: ...
     @overload
-    def __truediv__(self, other: _IntIndexType | _FloatIndexType) -> TimedeltaIndex: ...
+    def __truediv__(self, other: Index[int] | Index[float]) -> TimedeltaIndex: ...
     def __rtruediv__(self, other: timedelta | Timedelta | NaTType) -> float: ...
     # Override due to more types supported than dt.timedelta
     @overload
@@ -338,7 +333,7 @@ class Timedelta(timedelta):
     @overload
     def __mod__(self, other: Series[int] | Series[float]) -> TimedeltaSeries: ...
     @overload
-    def __mod__(self, other: _IntIndexType | _FloatIndexType) -> TimedeltaIndex: ...
+    def __mod__(self, other: Index[int] | Index[float]) -> TimedeltaIndex: ...
     @overload
     def __mod__(
         self, other: npt.NDArray[np.integer] | npt.NDArray[np.floating]

pandas-stubs/_typing.pyi

@@ -664,6 +664,26 @@ StataDateFormat: TypeAlias = Literal[
 ]
 
 FillnaOptions: TypeAlias = Literal["backfill", "bfill", "ffill", "pad"]
+InterpolateOptions: TypeAlias = Literal[
+    "linear",
+    "time",
+    "index",
+    "pad",
+    "nearest",
+    "zero",
+    "slinear",
+    "quadratic",
+    "cubic",
+    "barycentric",
+    "polynomial",
+    "krogh",
+    "piecewise_polynomial",
+    "spline",
+    "pchip",
+    "akima",
+    "cubicspline",
+    "from_derivatives",
+]
 ReplaceMethod: TypeAlias = Literal["pad", "ffill", "bfill"]
 SortKind: TypeAlias = Literal["quicksort", "mergesort", "heapsort", "stable"]
 NaPosition: TypeAlias = Literal["first", "last"]

pandas-stubs/core/base.pyi

@@ -1,5 +1,6 @@
 from typing import (
     Generic,
+    Iterator,
     Literal,
 )
 
@@ -9,8 +10,10 @@ from pandas.core.accessor import DirNamesMixin
 from pandas.core.arraylike import OpsMixin
 from pandas.core.arrays import ExtensionArray
 from pandas.core.arrays.categorical import Categorical
+from typing_extensions import Self
 
 from pandas._typing import (
+    S1,
     AxisIndex,
     NaPosition,
     NDFrameT,
@@ -28,16 +31,16 @@ class SelectionMixin(Generic[NDFrameT]):
     def ndim(self) -> int: ...
     def __getitem__(self, key): ...
 
-class IndexOpsMixin(OpsMixin):
+class IndexOpsMixin(OpsMixin, Generic[S1]):
     __array_priority__: int = ...
-    def transpose(self, *args, **kwargs) -> IndexOpsMixin: ...
+    def transpose(self, *args, **kwargs) -> Self: ...
     @property
-    def T(self) -> IndexOpsMixin: ...
+    def T(self) -> Self: ...
     @property
     def shape(self) -> tuple: ...
     @property
     def ndim(self) -> int: ...
-    def item(self): ...
+    def item(self) -> S1: ...
     @property
     def nbytes(self) -> int: ...
     @property
@@ -61,9 +64,9 @@ class IndexOpsMixin(OpsMixin):
     def argmin(
         self, axis: AxisIndex | None = ..., skipna: bool = ..., *args, **kwargs
     ) -> np.int64: ...
-    def tolist(self) -> list: ...
-    def to_list(self) -> list: ...
-    def __iter__(self): ...
+    def tolist(self) -> list[S1]: ...
+    def to_list(self) -> list[S1]: ...
+    def __iter__(self) -> Iterator[S1]: ...
     @property
     def hasnans(self) -> bool: ...
     def value_counts(
@@ -87,6 +90,4 @@ class IndexOpsMixin(OpsMixin):
     def searchsorted(
         self, value, side: Literal["left", "right"] = ..., sorter=...
     ) -> int | list[int]: ...
-    def drop_duplicates(
-        self, *, keep: NaPosition | Literal[False] = ...
-    ) -> IndexOpsMixin: ...
+    def drop_duplicates(self, *, keep: NaPosition | Literal[False] = ...) -> Self: ...

pandas-stubs/core/frame.pyi

@@ -86,6 +86,7 @@ from pandas._typing import (
     IndexingInt,
     IndexLabel,
     IndexType,
+    InterpolateOptions,
     IntervalClosedType,
     IntervalT,
     JoinHow,
@@ -1704,7 +1705,7 @@ class DataFrame(NDFrame, OpsMixin):
     @overload
     def interpolate(
         self,
-        method: _str = ...,
+        method: InterpolateOptions = ...,
         *,
         axis: Axis = ...,
         limit: int | None = ...,
@@ -1717,7 +1718,7 @@ class DataFrame(NDFrame, OpsMixin):
     @overload
     def interpolate(
         self,
-        method: _str = ...,
+        method: InterpolateOptions = ...,
         *,
         axis: Axis = ...,
         limit: int | None = ...,
@@ -1730,7 +1731,7 @@ class DataFrame(NDFrame, OpsMixin):
     @overload
     def interpolate(
         self,
-        method: _str = ...,
+        method: InterpolateOptions = ...,
         *,
         axis: Axis = ...,
         limit: int | None = ...,

pandas-stubs/core/indexes/accessors.pyi

@@ -25,7 +25,6 @@ from pandas.core.base import (
     PandasObject,
 )
 from pandas.core.frame import DataFrame
-from pandas.core.indexes.base import _IntIndexType
 from pandas.core.series import (
     PeriodSeries,
     Series,
@@ -43,7 +42,7 @@ from pandas._typing import (
 class Properties(PandasDelegate, PandasObject, NoNewAttributesMixin):
     def __init__(self, data: Series, orig) -> None: ...
 
-_DTFieldOpsReturnType = TypeVar("_DTFieldOpsReturnType", Series[int], _IntIndexType)
+_DTFieldOpsReturnType = TypeVar("_DTFieldOpsReturnType", Series[int], Index[int])
 
 class _DayLikeFieldOps(Generic[_DTFieldOpsReturnType]):
     @property
@@ -302,7 +301,7 @@ class TimedeltaProperties(
 ): ...
 
 _PeriodDTReturnTypes = TypeVar("_PeriodDTReturnTypes", TimestampSeries, DatetimeIndex)
-_PeriodIntReturnTypes = TypeVar("_PeriodIntReturnTypes", Series[int], _IntIndexType)
+_PeriodIntReturnTypes = TypeVar("_PeriodIntReturnTypes", Series[int], Index[int])
 _PeriodStrReturnTypes = TypeVar("_PeriodStrReturnTypes", Series[str], Index)
 _PeriodDTAReturnTypes = TypeVar("_PeriodDTAReturnTypes", DatetimeArray, DatetimeIndex)
 _PeriodPAReturnTypes = TypeVar("_PeriodPAReturnTypes", PeriodArray, PeriodIndex)
@@ -335,8 +334,8 @@ class _PeriodProperties(
     ) -> _PeriodPAReturnTypes: ...
 
 class PeriodIndexFieldOps(
-    _DayLikeFieldOps[_IntIndexType],
-    _PeriodProperties[DatetimeIndex, _IntIndexType, Index, DatetimeIndex, PeriodIndex],
+    _DayLikeFieldOps[Index[int]],
+    _PeriodProperties[DatetimeIndex, Index[int], Index, DatetimeIndex, PeriodIndex],
 ): ...
 class PeriodProperties(
     Properties,
@@ -382,7 +381,7 @@ class TimestampProperties(
 class DatetimeIndexProperties(
     Properties,
     _DatetimeNoTZProperties[
-        _IntIndexType,
+        Index[int],
         np_ndarray_bool,
         DatetimeIndex,
         np.ndarray,