Merge branch 'main' into gh1419_index_where

Author: loicdiridollou

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ ci:
     autofix_prs: false
 repos:
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.13.3
+    rev: v0.14.1
     hooks:
     -   id: ruff-check
         args: [--exit-non-zero-on-fix]

pandas-stubs/_libs/tslibs/period.pyi

@@ -1,24 +1,24 @@
 import datetime
+import sys
 from typing import (
     Literal,
     TypeAlias,
     overload,
 )
 
 import numpy as np
-from pandas import (
-    Index,
-    PeriodIndex,
-    Series,
-    Timedelta,
-    TimedeltaIndex,
-)
+from pandas.core.indexes.base import Index
+from pandas.core.indexes.period import PeriodIndex
+from pandas.core.indexes.timedeltas import TimedeltaIndex
+from pandas.core.series import Series
 from typing_extensions import Self
 
 from pandas._libs.tslibs import NaTType
 from pandas._libs.tslibs.offsets import BaseOffset
+from pandas._libs.tslibs.timedeltas import Timedelta
 from pandas._libs.tslibs.timestamps import Timestamp
 from pandas._typing import (
+    PeriodFrequency,
     ShapeT,
     np_1darray,
     np_ndarray,
@@ -63,7 +63,7 @@ class Period(PeriodMixin):
         value: (
             Period | str | datetime.datetime | datetime.date | Timestamp | None
         ) = ...,
-        freq: str | BaseOffset | None = ...,
+        freq: PeriodFrequency | None = None,
         ordinal: int | None = ...,
         year: int | None = ...,
         month: int | None = ...,
@@ -76,7 +76,7 @@ class Period(PeriodMixin):
     @overload
     def __sub__(self, other: _PeriodAddSub) -> Period: ...
     @overload
-    def __sub__(self, other: Period) -> BaseOffset: ...
+    def __sub__(self, other: Self) -> BaseOffset: ...
     @overload
     def __sub__(self, other: NaTType) -> NaTType: ...
     @overload
@@ -91,24 +91,21 @@ class Period(PeriodMixin):
     def __add__(self, other: _PeriodAddSub) -> Self: ...
     @overload
     def __add__(self, other: NaTType) -> NaTType: ...
-    @overload
-    def __add__(self, other: Index) -> PeriodIndex: ...
     # Ignored due to indecipherable error from mypy:
     # Forward operator "__add__" is not callable  [misc]
-    @overload
-    def __radd__(self, other: _PeriodAddSub) -> Self: ...  # type: ignore[misc]
+    if sys.version_info >= (3, 11):
+        @overload
+        def __radd__(self, other: _PeriodAddSub) -> Self: ...
+    else:
+        @overload
+        def __radd__(self, other: _PeriodAddSub) -> Self: ...  # type: ignore[misc]
+
     @overload
     def __radd__(self, other: NaTType) -> NaTType: ...
-    # Real signature is -> PeriodIndex, but conflicts with Index.__add__
-    # Changing Index is very hard due to Index inheritance
-    #   Signatures of "__radd__" of "Period" and "__add__" of "Index"
-    #   are unsafely overlapping
-    @overload
-    def __radd__(self, other: Index) -> PeriodIndex: ...
     #  ignore[misc] here because we know all other comparisons
     #  are False, so we use Literal[False]
     @overload
-    def __eq__(self, other: Period) -> bool: ...  # type: ignore[overload-overlap] # pyright: ignore[reportOverlappingOverload]
+    def __eq__(self, other: Self) -> bool: ...  # type: ignore[overload-overlap] # pyright: ignore[reportOverlappingOverload]
     @overload
     def __eq__(self, other: Index) -> np_1darray[np.bool]: ...  # type: ignore[overload-overlap]
     @overload
@@ -118,7 +115,7 @@ class Period(PeriodMixin):
     @overload
     def __eq__(self, other: object) -> Literal[False]: ...
     @overload
-    def __ge__(self, other: Period) -> bool: ...
+    def __ge__(self, other: Self) -> bool: ...
     @overload
     def __ge__(self, other: PeriodIndex) -> np_1darray[np.bool]: ...
     @overload
@@ -130,7 +127,7 @@ class Period(PeriodMixin):
         self, other: np_ndarray[ShapeT, np.object_]
     ) -> np_ndarray[ShapeT, np.bool]: ...
     @overload
-    def __gt__(self, other: Period) -> bool: ...
+    def __gt__(self, other: Self) -> bool: ...
     @overload
     def __gt__(self, other: PeriodIndex) -> np_1darray[np.bool]: ...
     @overload
@@ -142,7 +139,7 @@ class Period(PeriodMixin):
         self, other: np_ndarray[ShapeT, np.object_]
     ) -> np_ndarray[ShapeT, np.bool]: ...
     @overload
-    def __le__(self, other: Period) -> bool: ...
+    def __le__(self, other: Self) -> bool: ...
     @overload
     def __le__(self, other: PeriodIndex) -> np_1darray[np.bool]: ...
     @overload
@@ -154,7 +151,7 @@ class Period(PeriodMixin):
         self, other: np_ndarray[ShapeT, np.object_]
     ) -> np_ndarray[ShapeT, np.bool]: ...
     @overload
-    def __lt__(self, other: Period) -> bool: ...
+    def __lt__(self, other: Self) -> bool: ...
     @overload
     def __lt__(self, other: PeriodIndex) -> np_1darray[np.bool]: ...
     @overload
@@ -168,7 +165,7 @@ class Period(PeriodMixin):
     #  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]
+    def __ne__(self, other: Self) -> bool: ...  # type: ignore[overload-overlap] # pyright: ignore[reportOverlappingOverload]
     @overload
     def __ne__(self, other: Index) -> np_1darray[np.bool]: ...  # type: ignore[overload-overlap]
     @overload
@@ -223,12 +220,12 @@ class Period(PeriodMixin):
     def day_of_year(self) -> int: ...
     @property
     def day_of_week(self) -> int: ...
-    def asfreq(self, freq: str | BaseOffset, how: _PeriodFreqHow = "end") -> Period: ...
+    def asfreq(self, freq: PeriodFrequency, how: _PeriodFreqHow = "end") -> Period: ...
     @classmethod
-    def now(cls, freq: str | BaseOffset = ...) -> Period: ...
+    def now(cls, freq: PeriodFrequency | None = None) -> Period: ...
     def strftime(self, fmt: str) -> str: ...
     def to_timestamp(
         self,
-        freq: str | BaseOffset | None = ...,
+        freq: PeriodFrequency | None = None,
         how: _PeriodToTimestampHow = "S",
     ) -> Timestamp: ...

pandas-stubs/_libs/tslibs/timedeltas.pyi

@@ -13,28 +13,24 @@ from typing import (
 )
 
 import numpy as np
-import pandas as pd
-from pandas import (
-    DatetimeIndex,
-    Index,
-    PeriodIndex,
-    Series,
-    TimedeltaIndex,
-)
+from numpy import typing as npt
+from pandas.core.indexes.base import Index
+from pandas.core.indexes.datetimes import DatetimeIndex
+from pandas.core.indexes.period import PeriodIndex
+from pandas.core.indexes.timedeltas import TimedeltaIndex
+from pandas.core.series import Series
 from typing_extensions import Self
 
-from pandas._libs.tslibs import (
-    BaseOffset,
-    NaTType,
-)
+from pandas._libs.tslibs import NaTType
 from pandas._libs.tslibs.period import Period
 from pandas._libs.tslibs.timestamps import Timestamp
 from pandas._typing import (
+    Frequency,
+    Just,
     ShapeT,
     TimeUnit,
     np_1darray,
     np_ndarray,
-    npt,
 )
 
 class Components(NamedTuple):
@@ -130,10 +126,10 @@ class Timedelta(timedelta):
     def to_timedelta64(self) -> np.timedelta64: ...
     @property
     def asm8(self) -> np.timedelta64: ...
-    # TODO: round/floor/ceil could return NaT?
-    def round(self, freq: str | BaseOffset) -> Self: ...
-    def floor(self, freq: str | BaseOffset) -> Self: ...
-    def ceil(self, freq: str | BaseOffset) -> Self: ...
+    # TODO: pandas-dev/pandas-stubs#1432 round/floor/ceil could return NaT?
+    def round(self, freq: Frequency) -> Self: ...
+    def floor(self, freq: Frequency) -> Self: ...
+    def ceil(self, freq: Frequency) -> Self: ...
     @property
     def resolution_string(self) -> str: ...
     # Override due to more types supported than timedelta
@@ -173,17 +169,17 @@ class Timedelta(timedelta):
     ) -> np_ndarray[ShapeT, np.datetime64]: ...
     # Override due to more types supported than timedelta
     @overload  # type: ignore[override]
-    def __sub__(self, other: timedelta | Timedelta | np.timedelta64) -> Self: ...
+    def __sub__(self, other: timedelta | np.timedelta64 | Self) -> Self: ...
     @overload
     def __sub__(self, other: NaTType) -> NaTType: ...
     @overload
     def __sub__(
         self, other: np_ndarray[ShapeT, np.timedelta64]
     ) -> np_ndarray[ShapeT, np.timedelta64]: ...
     @overload
-    def __sub__(self, other: pd.TimedeltaIndex) -> TimedeltaIndex: ...
+    def __sub__(self, other: TimedeltaIndex) -> TimedeltaIndex: ...
     @overload
-    def __rsub__(self, other: timedelta | Timedelta | np.timedelta64) -> Self: ...
+    def __rsub__(self, other: timedelta | np.timedelta64 | Self) -> Self: ...
     @overload
     def __rsub__(self, other: datetime | Timestamp | np.datetime64) -> Timestamp: ...  # type: ignore[misc]
     @overload
@@ -203,27 +199,27 @@ class Timedelta(timedelta):
         self, other: np_ndarray[ShapeT, np.timedelta64]
     ) -> np_ndarray[ShapeT, np.timedelta64]: ...
     @overload
-    def __rsub__(self, other: pd.TimedeltaIndex) -> pd.TimedeltaIndex: ...
+    def __rsub__(self, other: TimedeltaIndex) -> TimedeltaIndex: ...
     def __neg__(self) -> Self: ...
     def __pos__(self) -> Self: ...
     def __abs__(self) -> Self: ...
     # Override due to more types supported than timedelta
     @overload  # type: ignore[override]
-    def __mul__(self, other: float) -> Self: ...
+    def __mul__(self, other: Just[float] | Just[int]) -> Self: ...
     @overload
     def __mul__(
         self, other: np_ndarray[ShapeT, np.bool_ | np.integer | np.floating]
     ) -> np_ndarray[ShapeT, np.timedelta64]: ...
     @overload
-    def __rmul__(self, other: float) -> Self: ...
+    def __rmul__(self, other: Just[float] | Just[int]) -> Self: ...
     @overload
     def __rmul__(
         self, other: np_ndarray[ShapeT, np.bool_ | np.integer | np.floating]
     ) -> np_ndarray[ShapeT, np.timedelta64]: ...
     # Override due to more types supported than timedelta
     # error: Signature of "__floordiv__" incompatible with supertype "timedelta"
     @overload  # type: ignore[override]
-    def __floordiv__(self, other: timedelta | Timedelta | np.timedelta64) -> int: ...
+    def __floordiv__(self, other: timedelta | np.timedelta64 | Self) -> int: ...
     @overload
     def __floordiv__(self, other: float) -> Self: ...
     @overload
@@ -254,27 +250,29 @@ class Timedelta(timedelta):
     ) -> np_ndarray[ShapeT, np.int_]: ...
     # Override due to more types supported than timedelta
     @overload  # type: ignore[override]
-    def __truediv__(self, other: timedelta | Timedelta | NaTType) -> float: ...
+    # pyrefly: ignore[bad-override]
+    def __truediv__(self, other: Just[int] | Just[float]) -> Self: ...
     @overload
-    def __truediv__(self, other: float) -> Self: ...
+    def __truediv__(self, other: Self | NaTType) -> float: ...
     @overload
     def __truediv__(
         self, other: np_ndarray[ShapeT, np.integer | np.floating]
     ) -> np_ndarray[ShapeT, np.timedelta64]: ...
     @overload
-    def __truediv__(self, other: Series[Timedelta]) -> Series[float]: ...
-    @overload
-    def __truediv__(self, other: Series[int]) -> Series[Timedelta]: ...
+    def __truediv__(
+        self, other: np_ndarray[ShapeT, np.timedelta64]
+    ) -> np_ndarray[ShapeT, np.floating]: ...
     @overload
-    def __truediv__(self, other: Series[float]) -> Series[Timedelta]: ...
+    def __rtruediv__(self, other: Self | NaTType) -> float: ...
     @overload
-    def __truediv__(self, other: Index[int] | Index[float]) -> TimedeltaIndex: ...
-    def __rtruediv__(self, other: timedelta | Timedelta | NaTType) -> float: ...
+    def __rtruediv__(
+        self, other: np_ndarray[ShapeT, np.timedelta64]
+    ) -> np_ndarray[ShapeT, np.floating]: ...
     # Override due to more types supported than timedelta
     @overload
-    def __eq__(self, other: timedelta | Timedelta | np.timedelta64) -> bool: ...  # type: ignore[overload-overlap] # pyright: ignore[reportOverlappingOverload]
+    def __eq__(self, other: timedelta | np.timedelta64 | Self) -> bool: ...  # type: ignore[overload-overlap] # pyright: ignore[reportOverlappingOverload]
     @overload
-    def __eq__(self, other: Series[pd.Timedelta]) -> Series[bool]: ...  # type: ignore[overload-overlap]
+    def __eq__(self, other: Series[Timedelta]) -> Series[bool]: ...  # type: ignore[overload-overlap]
     @overload
     def __eq__(self, other: Index) -> np_1darray[np.bool]: ...  # type: ignore[overload-overlap]
     @overload
@@ -285,9 +283,9 @@ class Timedelta(timedelta):
     def __eq__(self, other: object) -> Literal[False]: ...
     # Override due to more types supported than timedelta
     @overload
-    def __ne__(self, other: timedelta | Timedelta | np.timedelta64) -> bool: ...  # type: ignore[overload-overlap] # pyright: ignore[reportOverlappingOverload]
+    def __ne__(self, other: timedelta | np.timedelta64 | Self) -> bool: ...  # type: ignore[overload-overlap] # pyright: ignore[reportOverlappingOverload]
     @overload
-    def __ne__(self, other: Series[pd.Timedelta]) -> Series[bool]: ...  # type: ignore[overload-overlap]
+    def __ne__(self, other: Series[Timedelta]) -> Series[bool]: ...  # type: ignore[overload-overlap]
     @overload
     def __ne__(self, other: Index) -> np_1darray[np.bool]: ...  # type: ignore[overload-overlap]
     @overload
@@ -314,52 +312,50 @@ class Timedelta(timedelta):
         self, other: Series[int] | Series[float] | Series[Timedelta]
     ) -> Series[Timedelta]: ...
     def __divmod__(self, other: timedelta) -> tuple[int, Timedelta]: ...
-    # Mypy complains Forward operator "<inequality op>" is not callable, so ignore misc
-    # for le, lt ge and gt
     # Override due to more types supported than timedelta
     @overload  # type: ignore[override]
-    def __le__(self, other: timedelta | Timedelta | np.timedelta64) -> bool: ...  # type: ignore[misc]
+    def __le__(self, other: timedelta | np.timedelta64 | Self) -> bool: ...
     @overload
     def __le__(self, other: TimedeltaIndex) -> np_1darray[np.bool]: ...
     @overload
     def __le__(
         self, other: np_ndarray[ShapeT, np.timedelta64]
     ) -> np_ndarray[ShapeT, np.bool_]: ...
     @overload
-    def __le__(self, other: Series[pd.Timedelta]) -> Series[bool]: ...
+    def __le__(self, other: Series[Timedelta]) -> Series[bool]: ...
     # Override due to more types supported than timedelta
     @overload  # type: ignore[override]
-    def __lt__(self, other: timedelta | Timedelta | np.timedelta64) -> bool: ...  # type: ignore[misc]
+    def __lt__(self, other: timedelta | np.timedelta64 | Self) -> bool: ...
     @overload
     def __lt__(self, other: TimedeltaIndex) -> np_1darray[np.bool]: ...
     @overload
     def __lt__(
         self, other: np_ndarray[ShapeT, np.timedelta64]
     ) -> np_ndarray[ShapeT, np.bool_]: ...
     @overload
-    def __lt__(self, other: Series[pd.Timedelta]) -> Series[bool]: ...
+    def __lt__(self, other: Series[Timedelta]) -> Series[bool]: ...
     # Override due to more types supported than timedelta
     @overload  # type: ignore[override]
-    def __ge__(self, other: timedelta | Timedelta | np.timedelta64) -> bool: ...  # type: ignore[misc]
+    def __ge__(self, other: timedelta | np.timedelta64 | Self) -> bool: ...
     @overload
     def __ge__(self, other: TimedeltaIndex) -> np_1darray[np.bool]: ...
     @overload
     def __ge__(
         self, other: np_ndarray[ShapeT, np.timedelta64]
     ) -> np_ndarray[ShapeT, np.bool_]: ...
     @overload
-    def __ge__(self, other: Series[pd.Timedelta]) -> Series[bool]: ...
+    def __ge__(self, other: Series[Timedelta]) -> Series[bool]: ...
     # Override due to more types supported than timedelta
     @overload  # type: ignore[override]
-    def __gt__(self, other: timedelta | Timedelta | np.timedelta64) -> bool: ...  # type: ignore[misc]
+    def __gt__(self, other: timedelta | np.timedelta64 | Self) -> bool: ...
     @overload
     def __gt__(self, other: TimedeltaIndex) -> np_1darray[np.bool]: ...
     @overload
     def __gt__(
         self, other: np_ndarray[ShapeT, np.timedelta64]
     ) -> np_ndarray[ShapeT, np.bool_]: ...
     @overload
-    def __gt__(self, other: Series[pd.Timedelta]) -> Series[bool]: ...
+    def __gt__(self, other: Series[Timedelta]) -> Series[bool]: ...
     def __hash__(self) -> int: ...
     def isoformat(self) -> str: ...
     def to_numpy(self) -> np.timedelta64: ...