Merge branch 'main' into gh1419_index_where

Author: loicdiridollou

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
       matrix:
         # macos-latest is arm
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
     name: OS ${{ matrix.os }} - Python ${{ matrix.python-version }}
 

.pre-commit-config.yaml

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

pandas-stubs/_testing/__init__.pyi

@@ -92,16 +92,6 @@ def assert_timedelta_array_equal(
     obj: str = "TimedeltaArray",
     check_freq: bool = True,
 ) -> None: ...
-def assert_numpy_array_equal(
-    left,
-    right,
-    strict_nan: bool = False,
-    check_dtype: bool | Literal["equiv"] = True,
-    err_msg: str | None = None,
-    check_same: Literal["copy", "same"] | None = None,
-    obj: str = "numpy array",
-    index_values: Index | np.ndarray | None = None,
-) -> None: ...
 def assert_extension_array_equal(
     left: ExtensionArray,
     right: ExtensionArray,
@@ -173,7 +163,6 @@ def assert_frame_equal(
     atol: float = 1e-8,
     obj: str = "DataFrame",
 ) -> None: ...
-def assert_equal(left, right, **kwargs: Any) -> None: ...
 def assert_sp_array_equal(left: SparseArray, right: SparseArray) -> None: ...
 def assert_contains_all(iterable: Iterable[T], dic: Container[T]) -> None: ...
 def assert_copy(iter1: Iterable[T], iter2: Iterable[T], **eql_kwargs: Any) -> None: ...

pandas-stubs/_typing.pyi

@@ -911,8 +911,10 @@ SeriesDType: TypeAlias = (
 S1 = TypeVar("S1", bound=SeriesDType, default=Any)
 # Like S1, but without `default=Any`.
 S2 = TypeVar("S2", bound=SeriesDType)
-S2_CT = TypeVar("S2_CT", bound=SeriesDType, contravariant=True)
-S2_CT_NDT = TypeVar("S2_CT_NDT", bound=SeriesDTypeNoDateTime, contravariant=True)
+S2_contra = TypeVar("S2_contra", bound=SeriesDType, contravariant=True)
+S2_NDT_contra = TypeVar(
+    "S2_NDT_contra", bound=SeriesDTypeNoDateTime, contravariant=True
+)
 S2_NSDT = TypeVar("S2_NSDT", bound=SeriesDTypeNoStrDateTime)
 S3 = TypeVar("S3", bound=SeriesDType)
 

pandas-stubs/core/algorithms.pyi

@@ -1,4 +1,5 @@
 from typing import (
+    Any,
     Literal,
     overload,
 )
@@ -72,9 +73,9 @@ def value_counts(
     dropna: bool = True,
 ) -> Series: ...
 def take(
-    arr,
+    arr: np.ndarray | ExtensionArray | Index | Series,
     indices: TakeIndexer,
     axis: Literal[0, 1] = 0,
     allow_fill: bool = False,
-    fill_value=None,
-): ...
+    fill_value: Any = None,
+) -> np_1darray | ExtensionArray: ...

pandas-stubs/core/arrays/interval.pyi

@@ -5,11 +5,9 @@ from typing import (
 )
 
 import numpy as np
-from pandas import (
-    Index,
-    Series,
-)
 from pandas.core.arrays.base import ExtensionArray as ExtensionArray
+from pandas.core.indexes.base import Index
+from pandas.core.series import Series
 from typing_extensions import Self
 
 from pandas._libs.interval import (
@@ -32,15 +30,15 @@ class IntervalArray(IntervalMixin, ExtensionArray):
     can_hold_na: bool = ...
     def __new__(
         cls, data, closed=..., dtype=..., copy: bool = ..., verify_integrity: bool = ...
-    ): ...
+    ) -> Self: ...
     @classmethod
     def from_breaks(
         cls,
         breaks,
         closed: str = "right",
         copy: bool = False,
         dtype=None,
-    ): ...
+    ) -> Self: ...
     @classmethod
     def from_arrays(
         cls,
@@ -49,15 +47,15 @@ class IntervalArray(IntervalMixin, ExtensionArray):
         closed: str = "right",
         copy: bool = False,
         dtype=...,
-    ): ...
+    ) -> Self: ...
     @classmethod
     def from_tuples(
         cls,
         data,
         closed: str = "right",
         copy: bool = False,
         dtype=None,
-    ): ...
+    ) -> Self: ...
     def __array__(
         self, dtype: NpDtype | None = None, copy: bool | None = None
     ) -> np_1darray: ...

pandas-stubs/core/arrays/sparse/accessor.pyi

@@ -1,5 +1,6 @@
-from pandas import Series
 from pandas.core.accessor import PandasDelegate
+from pandas.core.series import Series
+from typing_extensions import Self
 
 class BaseAccessor:
     def __init__(self, data=...) -> None: ...
@@ -12,7 +13,7 @@ class SparseAccessor(BaseAccessor, PandasDelegate):
 
 class SparseFrameAccessor(BaseAccessor, PandasDelegate):
     @classmethod
-    def from_spmatrix(cls, data, index=..., columns=...): ...
+    def from_spmatrix(cls, data, index=..., columns=...) -> Self: ...
     def to_dense(self): ...
     def to_coo(self): ...
     @property

pandas-stubs/core/arrays/sparse/array.pyi

@@ -33,7 +33,7 @@ class SparseArray(ExtensionArray, ExtensionOpsMixin):
         copy: bool = ...,
     ) -> None: ...
     @classmethod
-    def from_spmatrix(cls, data): ...
+    def from_spmatrix(cls, data) -> Self: ...
     def __array__(
         self, dtype: NpDtype | None = None, copy: bool | None = None
     ) -> np_1darray: ...

pandas-stubs/core/frame.pyi

@@ -169,7 +169,9 @@ from pandas._typing import (
 from pandas.io.formats.style import Styler
 from pandas.plotting import PlotAccessor
 
-_T_MUTABLE_MAPPING = TypeVar("_T_MUTABLE_MAPPING", bound=MutableMapping, covariant=True)
+_T_MUTABLE_MAPPING_co = TypeVar(
+    "_T_MUTABLE_MAPPING_co", bound=MutableMapping, covariant=True
+)
 
 class _iLocIndexerFrame(_iLocIndexer, Generic[_T]):
     @overload
@@ -463,9 +465,9 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
         self,
         orient: Literal["records"],
         *,
-        into: _T_MUTABLE_MAPPING | type[_T_MUTABLE_MAPPING],
+        into: _T_MUTABLE_MAPPING_co | type[_T_MUTABLE_MAPPING_co],
         index: Literal[True] = ...,
-    ) -> list[_T_MUTABLE_MAPPING]: ...
+    ) -> list[_T_MUTABLE_MAPPING_co]: ...
     @overload
     def to_dict(
         self,
@@ -511,9 +513,9 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
         self,
         orient: Literal["dict", "list", "series"] = ...,
         *,
-        into: _T_MUTABLE_MAPPING | type[_T_MUTABLE_MAPPING],
+        into: _T_MUTABLE_MAPPING_co | type[_T_MUTABLE_MAPPING_co],
         index: Literal[True] = ...,
-    ) -> _T_MUTABLE_MAPPING: ...
+    ) -> _T_MUTABLE_MAPPING_co: ...
     @overload
     def to_dict(
         self,
@@ -2225,6 +2227,7 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
         fill_method: None = None,
         freq: Frequency | dt.timedelta | None = ...,
         fill_value: Scalar | NAType | None = ...,
+        axis: Axis | None = ...,
     ) -> Self: ...
     def pop(self, item: _str) -> Series: ...
     def pow(

pandas-stubs/core/groupby/groupby.pyi

@@ -302,7 +302,7 @@ class GroupBy(BaseGroupBy[NDFrameT]):
         periods: int | Sequence[int] = 1,
         freq: Frequency | None = ...,
         axis: Axis | _NoDefaultDoNotUse = 0,
-        fill_value=...,
+        fill_value: Scalar | None = None,
         suffix: str | None = ...,
     ) -> NDFrameT: ...
     @final