Merge branch 'main' into feature/cmp0xff/drop-interval-series

Author: cmp0xff

pandas-stubs/_libs/tslibs/period.pyi

@@ -12,7 +12,6 @@ from pandas import (
     Timedelta,
     TimedeltaIndex,
 )
-from pandas.core.series import OffsetSeries
 from typing_extensions import TypeAlias
 
 from pandas._libs.tslibs import NaTType
@@ -95,7 +94,7 @@ class Period(PeriodMixin):
     def __add__(self, other: Index) -> PeriodIndex: ...
     @overload
     def __add__(
-        self, other: OffsetSeries | Series[Timedelta]
+        self, other: Series[BaseOffset] | Series[Timedelta]
     ) -> Series[Period]: ...  # pyrefly: ignore[bad-specialization]
     #  ignore[misc] here because we know all other comparisons
     #  are False, so we use Literal[False]

pandas-stubs/core/arrays/categorical.pyi

@@ -96,7 +96,6 @@ class Categorical(ExtensionArray):
     @property
     def nbytes(self) -> int: ...
     def memory_usage(self, deep: bool = ...): ...
-    def searchsorted(self, value, side: str = ..., sorter=...): ...
     def isna(self) -> np_1darray[np.bool]: ...
     def isnull(self) -> np_1darray[np.bool]: ...
     def notna(self) -> np_1darray[np.bool]: ...

pandas-stubs/core/arrays/datetimelike.pyi

@@ -84,7 +84,6 @@ class DatetimeLikeArrayMixin(ExtensionOpsMixin, ExtensionArray):
     def unique(self): ...
     def copy(self): ...
     def shift(self, periods: int = 1, fill_value=..., axis: int = ...): ...
-    def searchsorted(self, value, side: str = ..., sorter=...): ...
     def repeat(self, repeats, *args, **kwargs): ...  # pyrefly: ignore
     def value_counts(self, dropna: bool = True): ...
     def map(self, mapper): ...

pandas-stubs/core/indexes/base.pyi

@@ -323,7 +323,9 @@ class Index(IndexOpsMixin[S1]):
         self, name: bool = ..., formatter: Callable | None = ..., na_rep: _str = ...
     ) -> list[_str]: ...
     def to_flat_index(self): ...
-    def to_series(self, index=..., name: Hashable = ...) -> Series[S1]: ...
+    def to_series(
+        self, index: Index | None = None, name: Hashable | None = None
+    ) -> Series[S1]: ...
     def to_frame(self, index: bool = True, name=...) -> DataFrame: ...
     @property
     def name(self) -> Hashable | None: ...

pandas-stubs/core/indexes/datetimes.pyi

@@ -77,10 +77,11 @@ class DatetimeIndex(
         self, other: datetime | np.datetime64 | np_ndarray_dt | DatetimeIndex
     ) -> TimedeltaIndex: ...
     @final
-    def to_series(self, index=..., name: Hashable = ...) -> Series[Timestamp]: ...
+    def to_series(
+        self, index: Index | None = None, name: Hashable | None = None
+    ) -> Series[Timestamp]: ...
     def snap(self, freq: str = ...): ...
     def slice_indexer(self, start=..., end=..., step=...): ...
-    def searchsorted(self, value, side: str = ..., sorter=...): ...
     @property
     def inferred_type(self) -> str: ...
     def indexer_at_time(self, time, asof: bool = ...): ...

pandas-stubs/core/indexes/timedeltas.pyi

@@ -81,11 +81,12 @@ class TimedeltaIndex(
         self, other: dt.timedelta | Sequence[dt.timedelta]
     ) -> Index[int]: ...
     def __rfloordiv__(self, other: dt.timedelta | Sequence[dt.timedelta]) -> Index[int]: ...  # type: ignore[override] # pyright: ignore[reportIncompatibleMethodOverride]
-    def searchsorted(self, value, side: str = ..., sorter=...): ...
     @property
     def inferred_type(self) -> str: ...
     @final
-    def to_series(self, index=..., name: Hashable = ...) -> Series[Timedelta]: ...
+    def to_series(
+        self, index: Index | None = None, name: Hashable | None = None
+    ) -> Series[Timedelta]: ...
     def shift(self, periods: int = 1, freq=...) -> Self: ...
 
 @overload

pandas-stubs/core/series.pyi

@@ -368,6 +368,15 @@ class Series(IndexOpsMixin[S1], NDFrame):
         copy: bool = ...,
     ) -> Series[Period]: ...
     @overload
+    def __new__(
+        cls,
+        data: Sequence[BaseOffset],
+        index: AxesData | None = ...,
+        dtype: PeriodDtype = ...,
+        name: Hashable = ...,
+        copy: bool = ...,
+    ) -> Series[BaseOffset]: ...
+    @overload
     def __new__(
         cls,
         data: (
@@ -848,8 +857,6 @@ class Series(IndexOpsMixin[S1], NDFrame):
         self: Series[BooleanDtype], periods: int = ...
     ) -> Series[BooleanDtype]: ...
     @overload
-    def diff(self: Series[Period], periods: int = ...) -> OffsetSeries: ...
-    @overload
     def diff(self: Series[Interval], periods: int = ...) -> Never: ...
     @overload
     def diff(
@@ -1065,7 +1072,7 @@ class Series(IndexOpsMixin[S1], NDFrame):
         convertDType: _bool = ...,
         args: tuple = ...,
         **kwargs: Any,
-    ) -> OffsetSeries: ...
+    ) -> Series[BaseOffset]: ...
     @overload
     def apply(
         self,
@@ -2018,6 +2025,10 @@ class Series(IndexOpsMixin[S1], NDFrame):
         other: _str | Sequence[_str] | np_ndarray_str | Index[_str] | Series[_str],
     ) -> Series[_str]: ...
     @overload
+    def __radd__(self: Series[BaseOffset], other: Period) -> Series[Period]: ...
+    @overload
+    def __radd__(self: Series[BaseOffset], other: BaseOffset) -> Series[BaseOffset]: ...
+    @overload
     def radd(
         self: Series[Never],
         other: complex | _ListLike | Index | Series,
@@ -4670,6 +4681,22 @@ class Series(IndexOpsMixin[S1], NDFrame):
         **kwargs,
     ) -> np_1darray[np.int64]: ...
     @overload
+    def to_numpy(
+        self: Series[BaseOffset],
+        dtype: None = None,
+        copy: bool = False,
+        na_value: Scalar = ...,
+        **kwargs,
+    ) -> np_1darray[np.object_]: ...
+    @overload
+    def to_numpy(
+        self: Series[BaseOffset],
+        dtype: type[np.bytes_],
+        copy: bool = False,
+        na_value: Scalar = ...,
+        **kwargs,
+    ) -> np_1darray[np.bytes_]: ...
+    @overload
     def to_numpy(
         self: Series[Interval],
         dtype: type[np.object_] | None = None,
@@ -4778,11 +4805,3 @@ class _SeriesSubclassBase(Series[S1], Generic[S1, GenericT_co]):
         na_value: Scalar = ...,
         **kwargs,
     ) -> np_1darray: ...
-
-class OffsetSeries(_SeriesSubclassBase[BaseOffset, np.object_]):
-    @overload  # type: ignore[override]
-    def __radd__(self, other: Period) -> Series[Period]: ...
-    @overload
-    def __radd__(  # pyright: ignore[reportIncompatibleMethodOverride]
-        self, other: BaseOffset
-    ) -> OffsetSeries: ...

tests/series/test_series.py

@@ -72,8 +72,6 @@
 )
 
 if TYPE_CHECKING:
-    from pandas.core.series import OffsetSeries
-
     from tests import (
         BooleanDtypeArg,
         BytesDtypeArg,
@@ -89,9 +87,6 @@
         VoidDtypeArg,
     )
 
-else:
-    OffsetSeries: TypeAlias = pd.Series
-
 if not PD_LTE_23:
     from pandas.errors import Pandas4Warning  # type: ignore[attr-defined]  # pyright: ignore  # isort: skip
 else:
@@ -3487,7 +3482,7 @@ def test_diff() -> None:
                     pd.Series(
                         pd.period_range(start="2017-01-01", end="2017-02-01", freq="D")
                     ).diff(),
-                    "OffsetSeries",
+                    "pd.Series[BaseOffset]",
                 ),
                 pd.Series,
                 BaseOffset,
@@ -3499,7 +3494,7 @@ def test_diff() -> None:
                 pd.Series(
                     pd.period_range(start="2017-01-01", end="2017-02-01", freq="D")
                 ).diff(),
-                "OffsetSeries",
+                "pd.Series[BaseOffset]",
             ),
             pd.Series,
             BaseOffset,
@@ -3676,7 +3671,9 @@ def test_apply_dateoffset() -> None:
     months = [1, 2, 3]
     s = pd.Series(months)
     check(
-        assert_type(s.apply(lambda x: pd.DateOffset(months=x)), "OffsetSeries"),
+        assert_type(
+            s.apply(lambda x: pd.DateOffset(months=x)), "pd.Series[BaseOffset]"
+        ),
         pd.Series,
         pd.DateOffset,
     )

tests/test_timefuncs.py

@@ -2,9 +2,7 @@
 
 import datetime as dt
 from typing import (
-    TYPE_CHECKING,
     Optional,
-    cast,
 )
 
 from dateutil.relativedelta import (
@@ -49,9 +47,6 @@
     Day,
 )
 
-if TYPE_CHECKING:
-    from pandas.core.series import OffsetSeries
-
 if not PD_LTE_23:
     from pandas.errors import Pandas4Warning  # type: ignore[attr-defined]  # pyright: ignore  # isort: skip
 else:
@@ -937,9 +932,7 @@ def test_series_types_to_numpy() -> None:
     td_s = pd.to_timedelta(pd.Series([10, 20]), "minutes")
     ts_s = pd.to_datetime(pd.Series(["2020-01-01", "2020-01-02"]))
     p_s = pd.Series(pd.period_range("2012-1-1", periods=10, freq="D"))
-    o_s = cast(
-        "OffsetSeries", pd.Series([pd.DateOffset(days=1), pd.DateOffset(days=2)])
-    )
+    o_s = pd.Series([pd.DateOffset(days=1), pd.DateOffset(days=2)])
     i_s = pd.interval_range(1, 2).to_series()
 
     # default dtype