Merge branch 'main' into hotfix/cmp0xff/gh718-drop-tss

Author: cmp0xff

pandas-stubs/_libs/interval.pyi

@@ -18,7 +18,7 @@ from pandas.core.series import TimedeltaSeries
 from pandas._typing import (
     IntervalClosedType,
     IntervalT,
-    np_ndarray_bool,
+    np_1darray,
     npt,
 )
 
@@ -167,7 +167,9 @@ class Interval(IntervalMixin, Generic[_OrderableT]):
     @overload
     def __gt__(self, other: Interval[_OrderableT]) -> bool: ...
     @overload
-    def __gt__(self: IntervalT, other: IntervalIndex[IntervalT]) -> np_ndarray_bool: ...
+    def __gt__(
+        self: IntervalT, other: IntervalIndex[IntervalT]
+    ) -> np_1darray[np.bool]: ...
     @overload
     def __gt__(
         self,
@@ -176,7 +178,9 @@ class Interval(IntervalMixin, Generic[_OrderableT]):
     @overload
     def __lt__(self, other: Interval[_OrderableT]) -> bool: ...
     @overload
-    def __lt__(self: IntervalT, other: IntervalIndex[IntervalT]) -> np_ndarray_bool: ...
+    def __lt__(
+        self: IntervalT, other: IntervalIndex[IntervalT]
+    ) -> np_1darray[np.bool]: ...
     @overload
     def __lt__(
         self,
@@ -185,7 +189,9 @@ class Interval(IntervalMixin, Generic[_OrderableT]):
     @overload
     def __ge__(self, other: Interval[_OrderableT]) -> bool: ...
     @overload
-    def __ge__(self: IntervalT, other: IntervalIndex[IntervalT]) -> np_ndarray_bool: ...
+    def __ge__(
+        self: IntervalT, other: IntervalIndex[IntervalT]
+    ) -> np_1darray[np.bool]: ...
     @overload
     def __ge__(
         self,
@@ -194,19 +200,25 @@ class Interval(IntervalMixin, Generic[_OrderableT]):
     @overload
     def __le__(self, other: Interval[_OrderableT]) -> bool: ...
     @overload
-    def __le__(self: IntervalT, other: IntervalIndex[IntervalT]) -> np_ndarray_bool: ...
+    def __le__(
+        self: IntervalT, other: IntervalIndex[IntervalT]
+    ) -> np_1darray[np.bool]: ...
     @overload
     def __eq__(self, other: Interval[_OrderableT]) -> bool: ...  # type: ignore[overload-overlap] # pyright: ignore[reportOverlappingOverload]
     @overload
-    def __eq__(self: IntervalT, other: IntervalIndex[IntervalT]) -> np_ndarray_bool: ...
+    def __eq__(
+        self: IntervalT, other: IntervalIndex[IntervalT]
+    ) -> np_1darray[np.bool]: ...
     @overload
     def __eq__(self, other: Series[_OrderableT]) -> Series[bool]: ...  # type: ignore[overload-overlap]
     @overload
     def __eq__(self, other: object) -> Literal[False]: ...
     @overload
     def __ne__(self, other: Interval[_OrderableT]) -> bool: ...  # type: ignore[overload-overlap] # pyright: ignore[reportOverlappingOverload]
     @overload
-    def __ne__(self: IntervalT, other: IntervalIndex[IntervalT]) -> np_ndarray_bool: ...
+    def __ne__(
+        self: IntervalT, other: IntervalIndex[IntervalT]
+    ) -> np_1darray[np.bool]: ...
     @overload
     def __ne__(self, other: Series[_OrderableT]) -> Series[bool]: ...  # type: ignore[overload-overlap]
     @overload

pandas-stubs/_libs/tslibs/offsets.pyi

@@ -29,11 +29,11 @@ class ApplyTypeError(TypeError): ...
 class BaseOffset:
     n: int
     def __init__(self, n: int = ..., normalize: bool = ...) -> None: ...
-    def __eq__(self, other) -> bool: ...
-    def __ne__(self, other) -> bool: ...
+    def __eq__(self, other: object) -> bool: ...
+    def __ne__(self, other: object) -> bool: ...
     def __hash__(self) -> int: ...
     @property
-    def kwds(self) -> dict: ...
+    def kwds(self) -> dict[str, Any]: ...
     @property
     def base(self) -> BaseOffset: ...
     @overload
@@ -67,7 +67,6 @@ class BaseOffset:
     def __rsub__(self, other: BaseOffset) -> Self: ...
     @overload
     def __rsub__(self, other: _TimedeltaT) -> _TimedeltaT: ...
-    def __call__(self, other): ...
     @overload
     def __mul__(self, other: np.ndarray) -> np.ndarray: ...
     @overload
@@ -87,8 +86,6 @@ class BaseOffset:
     def rollback(self, dt: datetime) -> datetime: ...
     def rollforward(self, dt: datetime) -> datetime: ...
     def is_on_offset(self, dt: datetime) -> bool: ...
-    def __setstate__(self, state) -> None: ...
-    def __getstate__(self): ...
     @property
     def nanos(self) -> int: ...
 

pandas-stubs/_libs/tslibs/period.pyi

@@ -22,7 +22,11 @@ from typing_extensions import TypeAlias
 from pandas._libs.tslibs import NaTType
 from pandas._libs.tslibs.offsets import BaseOffset
 from pandas._libs.tslibs.timestamps import Timestamp
-from pandas._typing import npt
+from pandas._typing import (
+    ShapeT,
+    np_1darray,
+    np_ndarray,
+)
 
 class IncompatibleFrequency(ValueError): ...
 
@@ -98,44 +102,64 @@ class Period(PeriodMixin):
     @overload
     def __eq__(self, other: Period) -> bool: ...  # type: ignore[overload-overlap] # pyright: ignore[reportOverlappingOverload]
     @overload
-    def __eq__(self, other: PeriodIndex) -> npt.NDArray[np.bool_]: ...  # type: ignore[overload-overlap]
+    def __eq__(self, other: PeriodIndex) -> np_1darray[np.bool]: ...  # type: ignore[overload-overlap]
     @overload
     def __eq__(self, other: PeriodSeries) -> Series[bool]: ...  # type: ignore[overload-overlap]
     @overload
+    def __eq__(self, other: np_ndarray[ShapeT, np.object_]) -> np_ndarray[ShapeT, np.bool]: ...  # type: ignore[overload-overlap]
+    @overload
     def __eq__(self, other: object) -> Literal[False]: ...
     @overload
     def __ge__(self, other: Period) -> bool: ...
     @overload
-    def __ge__(self, other: PeriodIndex) -> npt.NDArray[np.bool_]: ...
+    def __ge__(self, other: PeriodIndex) -> np_1darray[np.bool]: ...
     @overload
     def __ge__(self, other: PeriodSeries) -> Series[bool]: ...
     @overload
+    def __ge__(
+        self, other: np_ndarray[ShapeT, np.object_]
+    ) -> np_ndarray[ShapeT, np.bool]: ...
+    @overload
     def __gt__(self, other: Period) -> bool: ...
     @overload
-    def __gt__(self, other: PeriodIndex) -> npt.NDArray[np.bool_]: ...
+    def __gt__(self, other: PeriodIndex) -> np_1darray[np.bool]: ...
     @overload
     def __gt__(self, other: PeriodSeries) -> Series[bool]: ...
     @overload
+    def __gt__(
+        self, other: np_ndarray[ShapeT, np.object_]
+    ) -> np_ndarray[ShapeT, np.bool]: ...
+    @overload
     def __le__(self, other: Period) -> bool: ...
     @overload
-    def __le__(self, other: PeriodIndex) -> npt.NDArray[np.bool_]: ...
+    def __le__(self, other: PeriodIndex) -> np_1darray[np.bool]: ...
     @overload
     def __le__(self, other: PeriodSeries) -> Series[bool]: ...
     @overload
+    def __le__(
+        self, other: np_ndarray[ShapeT, np.object_]
+    ) -> np_ndarray[ShapeT, np.bool]: ...
+    @overload
     def __lt__(self, other: Period) -> bool: ...
     @overload
-    def __lt__(self, other: PeriodIndex) -> npt.NDArray[np.bool_]: ...
+    def __lt__(self, other: PeriodIndex) -> np_1darray[np.bool]: ...
     @overload
     def __lt__(self, other: PeriodSeries) -> Series[bool]: ...
+    @overload
+    def __lt__(
+        self, other: np_ndarray[ShapeT, np.object_]
+    ) -> np_ndarray[ShapeT, np.bool]: ...
     #  ignore[misc] here because we know all other comparisons
     #  are False, so we use Literal[False]
     @overload
     def __ne__(self, other: Period) -> bool: ...  # type: ignore[overload-overlap] # pyright: ignore[reportOverlappingOverload]
     @overload
-    def __ne__(self, other: PeriodIndex) -> npt.NDArray[np.bool_]: ...  # type: ignore[overload-overlap]
+    def __ne__(self, other: PeriodIndex) -> np_1darray[np.bool]: ...  # type: ignore[overload-overlap]
     @overload
     def __ne__(self, other: PeriodSeries) -> Series[bool]: ...  # type: ignore[overload-overlap]
     @overload
+    def __ne__(self, other: np_ndarray[ShapeT, np.object_]) -> np_ndarray[ShapeT, np.bool]: ...  # type: ignore[overload-overlap]
+    @overload
     def __ne__(self, other: object) -> Literal[True]: ...
     # Ignored due to indecipherable error from mypy:
     # Forward operator "__add__" is not callable  [misc]