Merge remote-tracking branch 'upstream/main' into scalars-interval

Author: bashtage

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
     hooks:
     -   id: isort
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.37.3
+    rev: v3.2.0
     hooks:
     -   id: pyupgrade
         types_or: [python, pyi]
@@ -27,7 +27,7 @@ repos:
     -   id: flake8
         name: flake8 (pyi)
         additional_dependencies:
-        - flake8-pyi==22.8.2
+        - flake8-pyi==22.10.0
         types: [pyi]
         args: [
           --ignore=E301 E302 E305 E402 E501 E701 E704 F401 F811 W503 Y019 Y027 Y034 Y037 Y041 Y042,

pandas-stubs/_libs/tslibs/offsets.pyi

@@ -1,6 +1,7 @@
 from datetime import (
     date,
     datetime,
+    time,
     timedelta,
 )
 from typing import (
@@ -78,6 +79,7 @@ class BaseOffset:
     def name(self) -> str: ...
     @property
     def rule_code(self) -> str: ...
+    @property
     def freqstr(self) -> str: ...
     def apply_index(self, dtindex: DatetimeIndex) -> DatetimeIndex: ...
     def rollback(self, dt: datetime) -> datetime: ...
@@ -131,8 +133,8 @@ class BusinessHour(BusinessMixin):
         self,
         n: int = ...,
         normalize: bool = ...,
-        start: str | Collection[str] = ...,
-        end: str | Collection[str] = ...,
+        start: str | time | Collection[str | time] = ...,
+        end: str | time | Collection[str | time] = ...,
         offset: timedelta = ...,
     ): ...
 
@@ -217,8 +219,8 @@ class CustomBusinessHour(BusinessHour):
         self,
         n: int = ...,
         normalize: bool = ...,
-        start: str = ...,
-        end: str = ...,
+        start: str | time | Collection[str | time] = ...,
+        end: str | time | Collection[str | time] = ...,
         offset: timedelta = ...,
         holidays: list | None = ...,
     ): ...

pandas-stubs/_testing/__init__.pyi

@@ -74,7 +74,7 @@ def assert_series_equal(
     obj: str = ...,
     *,
     check_index: Literal[False],
-    check_like: Literal[False],
+    check_like: Literal[False] = ...,
 ) -> None: ...
 @overload
 def assert_series_equal(

pandas-stubs/core/base.pyi

@@ -63,6 +63,7 @@ class IndexOpsMixin:
     def tolist(self) -> list: ...
     def to_list(self) -> list: ...
     def __iter__(self): ...
+    @property
     def hasnans(self) -> bool: ...
     def value_counts(
         self,

pandas-stubs/core/dtypes/common.pyi

@@ -28,7 +28,9 @@ from pandas.core.dtypes.inference import (
     is_scalar as is_scalar,
 )
 
-_ArrayOrDtype: TypeAlias = Union[ArrayLike, npt.DTypeLike, pd.Series, pd.DataFrame]
+_ArrayOrDtype: TypeAlias = Union[
+    ArrayLike, npt.DTypeLike, pd.Series, pd.DataFrame, pd.Index
+]
 
 def is_object_dtype(arr_or_dtype: _ArrayOrDtype) -> bool: ...
 def is_sparse(arr: ArrayLike | pd.Series | pd.DataFrame) -> bool: ...

pandas-stubs/core/frame.pyi

@@ -1276,8 +1276,6 @@ class DataFrame(NDFrame, OpsMixin):
     @property
     def at(self): ...  # Not sure what to do with this yet; look at source
     @property
-    def bool(self) -> _bool: ...
-    @property
     def columns(self) -> Index: ...
     @columns.setter  # setter needs to be right next to getter; otherwise mypy complains
     def columns(
@@ -1359,7 +1357,7 @@ class DataFrame(NDFrame, OpsMixin):
     ) -> DataFrame: ...
     def astype(
         self,
-        dtype: _str | Dtype | dict[_str, _str | Dtype],
+        dtype: _str | Dtype | dict[_str, _str | Dtype] | Series,
         copy: _bool = ...,
         errors: _str = ...,
     ) -> DataFrame: ...

pandas-stubs/core/generic.pyi

@@ -8,6 +8,7 @@ from typing import (
     Literal,
     Mapping,
     Sequence,
+    final,
     overload,
 )
 
@@ -83,6 +84,7 @@ class NDFrame(PandasObject, indexing.IndexingMixin):
     def __neg__(self: NDFrameT) -> NDFrameT: ...
     def __pos__(self: NDFrameT) -> NDFrameT: ...
     def __nonzero__(self) -> None: ...
+    @final
     def bool(self) -> _bool: ...
     def __abs__(self) -> NDFrame: ...
     def __round__(self, decimals: int = ...) -> NDFrame: ...

pandas-stubs/core/groupby/ops.pyi

@@ -70,6 +70,7 @@ class BinGrouper(BaseGrouper):
     def get_iterator(self, data: DataFrame | Series, axis: int = ...): ...
     def indices(self): ...
     def group_info(self): ...
+    @property
     def reconstructed_codes(self) -> list[np.ndarray]: ...
     def result_index(self): ...
     @property

pandas-stubs/core/indexes/base.pyi

@@ -112,6 +112,7 @@ class Index(IndexOpsMixin, PandasObject):
     def is_monotonic_increasing(self) -> bool: ...
     @property
     def is_monotonic_decreasing(self) -> bool: ...
+    @property
     def is_unique(self) -> bool: ...
     @property
     def has_duplicates(self) -> bool: ...
@@ -124,9 +125,10 @@ class Index(IndexOpsMixin, PandasObject):
     def is_interval(self) -> bool: ...
     def is_mixed(self) -> bool: ...
     def holds_integer(self): ...
+    @property
     def inferred_type(self): ...
-    def is_all_dates(self) -> bool: ...
     def __reduce__(self): ...
+    @property
     def hasnans(self) -> bool: ...
     def isna(self): ...
     isnull = ...
@@ -177,6 +179,7 @@ class Index(IndexOpsMixin, PandasObject):
     ): ...
     @property
     def values(self) -> np.ndarray: ...
+    @property
     def array(self) -> ExtensionArray: ...
     def memory_usage(self, deep: bool = ...): ...
     def where(self, cond, other=...): ...

pandas-stubs/core/indexes/category.pyi

@@ -28,6 +28,7 @@ class CategoricalIndex(ExtensionIndex, accessor.PandasDelegate):
     def __array__(self, dtype=...) -> np.ndarray: ...
     def astype(self, dtype: DtypeArg, copy: bool = ...) -> Index: ...
     def fillna(self, value=..., downcast=...): ...
+    @property
     def is_unique(self) -> bool: ...
     @property
     def is_monotonic_increasing(self) -> bool: ...

pandas-stubs/core/indexes/multi.pyi

@@ -65,8 +65,10 @@ class MultiIndex(Index):
     def __array__(self, dtype=...) -> np.ndarray: ...
     def view(self, cls=...): ...
     def __contains__(self, key) -> bool: ...
+    @property
     def dtype(self) -> np.dtype: ...
     def memory_usage(self, deep: bool = ...) -> int: ...
+    @property
     def nbytes(self) -> int: ...
     def format(
         self,
@@ -82,7 +84,9 @@ class MultiIndex(Index):
     def inferred_type(self) -> str: ...
     @property
     def values(self): ...
+    @property
     def is_monotonic_increasing(self) -> bool: ...
+    @property
     def is_monotonic_decreasing(self) -> bool: ...
     def duplicated(self, keep: Literal["first", "last", False] = ...): ...
     def fillna(self, value=..., downcast=...) -> None: ...

pandas-stubs/core/indexes/numeric.pyi

@@ -37,5 +37,6 @@ class Float64Index(NumericIndex):
     def equals(self, other) -> bool: ...
     def __contains__(self, other) -> bool: ...
     def get_loc(self, key, tolerance=...): ...
+    @property
     def is_unique(self) -> bool: ...
     def isin(self, values, level=...): ...

pandas-stubs/core/indexes/range.pyi

@@ -32,13 +32,16 @@ class RangeIndex(Int64Index):
     def start(self): ...
     def stop(self): ...
     def step(self): ...
+    @property
     def nbytes(self) -> int: ...
     def memory_usage(self, deep: bool = ...) -> int: ...
     @property
     def dtype(self) -> np.dtype: ...
     @property
     def is_unique(self) -> bool: ...
+    @property
     def is_monotonic_increasing(self) -> bool: ...
+    @property
     def is_monotonic_decreasing(self) -> bool: ...
     @property
     def has_duplicates(self) -> bool: ...

pandas-stubs/core/series.pyi

@@ -62,7 +62,10 @@ from pandas.core.window.rolling import (
     Rolling,
     Window,
 )
-from typing_extensions import TypeAlias
+from typing_extensions import (
+    Never,
+    TypeAlias,
+)
 import xarray as xr
 
 from pandas._libs.missing import NAType
@@ -467,8 +470,9 @@ class Series(IndexOpsMixin, NDFrame, Generic[S1]):
         observed: _bool = ...,
         dropna: _bool = ...,
     ) -> _SeriesGroupByNonScalar[S1]: ...
+    # need the ignore because None is Hashable
     @overload
-    def count(self, level: None = ...) -> int: ...
+    def count(self, level: None = ...) -> int: ...  # type: ignore[misc]
     @overload
     def count(self, level: Hashable) -> Series[S1]: ...
     def mode(self, dropna=...) -> Series[S1]: ...
@@ -1222,7 +1226,7 @@ class Series(IndexOpsMixin, NDFrame, Generic[S1]):
     def __add__(self, other: Timestamp) -> TimestampSeries: ...
     @overload
     def __add__(
-        self, other: num | _str | Timedelta | _ListLike | Series[S1]
+        self, other: num | _str | Timedelta | _ListLike | Series[S1] | np.timedelta64
     ) -> Series: ...
     # ignore needed for mypy as we want different results based on the arguments
     @overload
@@ -1254,7 +1258,9 @@ class Series(IndexOpsMixin, NDFrame, Generic[S1]):
     def __le__(self, other: S1 | _ListLike | Series[S1]) -> Series[_bool]: ...
     def __lt__(self, other: S1 | _ListLike | Series[S1]) -> Series[_bool]: ...
     @overload
-    def __mul__(self, other: Timedelta | TimedeltaSeries) -> TimedeltaSeries: ...
+    def __mul__(
+        self, other: Timedelta | TimedeltaSeries | np.timedelta64
+    ) -> TimedeltaSeries: ...
     @overload
     def __mul__(self, other: num | _ListLike | Series) -> Series: ...
     def __mod__(self, other: num | _ListLike | Series[S1]) -> Series[S1]: ...
@@ -1315,17 +1321,19 @@ class Series(IndexOpsMixin, NDFrame, Generic[S1]):
     ) -> TimedeltaSeries: ...
     @overload
     def __sub__(
-        self: Series[Timestamp], other: Timedelta | TimedeltaSeries | TimedeltaIndex
+        self: Series[Timestamp],
+        other: Timedelta | TimedeltaSeries | TimedeltaIndex | np.timedelta64,
     ) -> TimestampSeries: ...
     @overload
     def __sub__(
-        self: Series[Timedelta], other: Timedelta | TimedeltaSeries | TimedeltaIndex
+        self: Series[Timedelta],
+        other: Timedelta | TimedeltaSeries | TimedeltaIndex | np.timedelta64,
     ) -> TimedeltaSeries: ...
     @overload
     def __sub__(self, other: num | _ListLike | Series) -> Series: ...
     @overload
     def __truediv__(
-        self, other: Timedelta | TimedeltaSeries | TimedeltaIndex
+        self, other: Timedelta | TimedeltaSeries | TimedeltaIndex | np.timedelta64
     ) -> Series[float]: ...
     @overload
     def __truediv__(self, other: num | _ListLike | Series[S1]) -> Series: ...
@@ -1750,6 +1758,14 @@ class TimestampSeries(Series[Timestamp]):
     # ignore needed because of mypy
     @property
     def dt(self) -> TimestampProperties: ...  # type: ignore[override]
+    @overload  # type: ignore[override]
+    def __add__(
+        self, other: TimedeltaSeries | np.timedelta64 | TimestampSeries
+    ) -> TimestampSeries: ...
+    @overload
+    def __add__(self, other: Timestamp) -> Never: ...
+    def __mul__(self, other: TimestampSeries | np.timedelta64 | TimedeltaSeries) -> Never: ...  # type: ignore[override]
+    def __truediv__(self, other: TimestampSeries | np.timedelta64 | TimedeltaSeries) -> Never: ...  # type: ignore[override]
 
 class TimedeltaSeries(Series[Timedelta]):
     # ignores needed because of mypy
@@ -1758,12 +1774,18 @@ class TimedeltaSeries(Series[Timedelta]):
     @overload
     def __add__(self, other: Timestamp | DatetimeIndex) -> TimestampSeries: ...
     @overload
-    def __add__(self, other: Timedelta) -> TimedeltaSeries: ...
+    def __add__(self, other: Timedelta | np.timedelta64) -> TimedeltaSeries: ...
     def __radd__(self, pther: Timestamp | TimestampSeries) -> TimestampSeries: ...  # type: ignore[override]
-    def __mul__(self, other: num) -> TimedeltaSeries: ...  # type: ignore[override]
+    @overload  # type: ignore[override]
+    def __mul__(
+        self, other: TimestampSeries | np.timedelta64 | Timedelta | TimedeltaSeries
+    ) -> Never: ...
+    @overload
+    def __mul__(self, other: num) -> TimedeltaSeries: ...
     def __sub__(  # type: ignore[override]
-        self, other: Timedelta | TimedeltaSeries | TimedeltaIndex
+        self, other: Timedelta | TimedeltaSeries | TimedeltaIndex | np.timedelta64
     ) -> TimedeltaSeries: ...
+    def __truediv__(self, other: TimedeltaSeries | np.timedelta64 | TimedeltaIndex) -> Series[float]: ...  # type: ignore[override]
     @property
     def dt(self) -> TimedeltaProperties: ...  # type: ignore[override]
 

pandas-stubs/core/strings.pyi

@@ -142,8 +142,8 @@ class StringMethods(NoNewAttributesMixin, Generic[T, _TS]):
     def get_dummies(self, sep: str = ...) -> pd.DataFrame: ...
     def translate(self, table: dict[int, int | str | None] | None) -> T: ...
     def count(self, pat: str, flags: int = ...) -> Series[int]: ...
-    def startswith(self, pat: str, na: Any = ...) -> Series[bool]: ...
-    def endswith(self, pat: str, na: Any = ...) -> Series[bool]: ...
+    def startswith(self, pat: str | tuple[str, ...], na: Any = ...) -> Series[bool]: ...
+    def endswith(self, pat: str | tuple[str, ...], na: Any = ...) -> Series[bool]: ...
     def findall(self, pat: str, flags: int = ...) -> Series: ...
     @overload
     def extract(

pandas-stubs/util/version/__init__.pyi

@@ -0,0 +1,65 @@
+def parse(version: str) -> LegacyVersion | Version: ...
+
+class _BaseVersion:
+    def __lt__(self, other: _BaseVersion) -> bool: ...
+    def __le__(self, other: _BaseVersion) -> bool: ...
+    def __eq__(self, other: object) -> bool: ...
+    def __ge__(self, other: _BaseVersion) -> bool: ...
+    def __gt__(self, other: _BaseVersion) -> bool: ...
+    def __ne__(self, other: object) -> bool: ...
+
+class LegacyVersion(_BaseVersion):
+    def __init__(self, version: str) -> None: ...
+    @property
+    def public(self) -> str: ...
+    @property
+    def base_version(self) -> str: ...
+    @property
+    def epoch(self) -> int: ...
+    @property
+    def release(self) -> None: ...
+    @property
+    def pre(self) -> None: ...
+    @property
+    def post(self) -> None: ...
+    @property
+    def dev(self) -> None: ...
+    @property
+    def local(self) -> None: ...
+    @property
+    def is_prerelease(self) -> bool: ...
+    @property
+    def is_postrelease(self) -> bool: ...
+    @property
+    def is_devrelease(self) -> bool: ...
+
+class Version(_BaseVersion):
+    def __init__(self, version: str) -> None: ...
+    @property
+    def epoch(self) -> int: ...
+    @property
+    def release(self) -> tuple[int, ...]: ...
+    @property
+    def pre(self) -> tuple[str, int] | None: ...
+    @property
+    def post(self) -> int | None: ...
+    @property
+    def dev(self) -> int | None: ...
+    @property
+    def local(self) -> str | None: ...
+    @property
+    def public(self) -> str: ...
+    @property
+    def base_version(self) -> str: ...
+    @property
+    def is_prerelease(self) -> bool: ...
+    @property
+    def is_postrelease(self) -> bool: ...
+    @property
+    def is_devrelease(self) -> bool: ...
+    @property
+    def major(self) -> int: ...
+    @property
+    def minor(self) -> int: ...
+    @property
+    def micro(self) -> int: ...