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

Author: cmp0xff

pandas-stubs/core/frame.pyi

@@ -1760,7 +1760,9 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
     @property
     def index(self) -> Index: ...
     @index.setter
-    def index(self, idx: Index) -> None: ...
+    def index(
+        self, idx: AnyArrayLike | SequenceNotStr[Hashable] | tuple[Hashable, ...]
+    ) -> None: ...
     @property
     def loc(self) -> _LocIndexerFrame[Self]: ...
     @property

pandas-stubs/core/series.pyi

@@ -26,11 +26,13 @@ from typing import (
     Generic,
     Literal,
     NoReturn,
+    Protocol,
     final,
     overload,
     type_check_only,
 )
 
+from _typeshed import SupportsGetItem
 from matplotlib.axes import (
     Axes as PlotAxes,
     SubplotBase,
@@ -186,6 +188,7 @@ from pandas._typing import (
     ValueKeyFunc,
     VoidDtypeArg,
     WriteBuffer,
+    _T_co,
     np_1darray,
     np_ndarray_anyint,
     np_ndarray_bool,
@@ -203,6 +206,10 @@ from pandas.core.dtypes.dtypes import CategoricalDtype
 
 from pandas.plotting import PlotAccessor
 
+@type_check_only
+class _SupportsAdd(Protocol[_T_co]):
+    def __add__(self, value: Self, /) -> _T_co: ...
+
 class _iLocIndexerSeries(_iLocIndexer, Generic[S1]):
     # get item
     @overload
@@ -500,7 +507,9 @@ class Series(IndexOpsMixin[S1], NDFrame):
     @property
     def index(self) -> Index: ...
     @index.setter
-    def index(self, idx: Index) -> None: ...
+    def index(
+        self, idx: AnyArrayLike | SequenceNotStr[Hashable] | tuple[Hashable, ...]
+    ) -> None: ...
     @overload
     def reset_index(
         self,
@@ -4144,34 +4153,14 @@ class Series(IndexOpsMixin[S1], NDFrame):
         numeric_only: _bool = False,
         **kwargs: Any,
     ) -> float: ...
-    @overload
-    def sum(
-        self: Series[Never],
-        axis: AxisIndex | None = 0,
-        skipna: _bool | None = ...,
-        numeric_only: _bool = ...,
-        min_count: int = ...,
-        **kwargs: Any,
-    ) -> Any: ...
-    # between `Series[bool]` and `Series[int]`.
-    @overload
     def sum(
-        self: Series[bool],
+        self: SupportsGetItem[Scalar, _SupportsAdd[_T]],
         axis: AxisIndex | None = 0,
         skipna: _bool | None = ...,
         numeric_only: _bool = ...,
         min_count: int = ...,
         **kwargs: Any,
-    ) -> int: ...
-    @overload
-    def sum(
-        self: Series[S1],
-        axis: AxisIndex | None = 0,
-        skipna: _bool | None = ...,
-        numeric_only: _bool = ...,
-        min_count: int = ...,
-        **kwargs: Any,
-    ) -> S1: ...
+    ) -> _T: ...
     def to_list(self) -> list[S1]: ...
     @overload  # type: ignore[override]
     def to_numpy(

pyproject.toml

@@ -40,8 +40,8 @@ mypy = "1.17.1"
 pandas = "2.3.2"
 pyarrow = ">=10.0.1"
 pytest = ">=7.1.2"
-pyright = ">=1.1.404"
-ty = "^0.0.1a9"
+pyright = ">=1.1.405"
+ty = "^0.0.1a20"
 pyrefly = "^0.21.0"
 poethepoet = ">=0.16.5"
 loguru = ">=0.6.0"

scripts/test/run.py

@@ -94,7 +94,6 @@ def nightly_pandas():
         "pip",
         "install",
         "--pre",
-        "--use-deprecated=legacy-resolver",
         "--upgrade",
         "--extra-index-url",
         "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple",

tests/series/test_series.py

@@ -3980,3 +3980,12 @@ def test_series_explode() -> None:
 
     check(assert_type(s.explode(), pd.Series), pd.Series)
     check(assert_type(s.explode(ignore_index=True), pd.Series), pd.Series)
+
+
+def test_series_index_setter() -> None:
+    """Test Series.index setter property GH1366."""
+    sr = pd.Series(["a", "b"])
+
+    check(assert_type(sr.index, pd.Index), pd.Index)
+    sr.index = [2, 3]
+    check(assert_type(sr.index, pd.Index), pd.Index)

tests/test_frame.py

@@ -4649,7 +4649,7 @@ def test_unstack() -> None:
     df_flt = pd.DataFrame(
         [
             ["a", "b", 1],
-            ["a", "a", 12],
+            ["a", "a", 12.2],
             ["b", "b", 14],
         ]
     ).set_index([0, 1])
@@ -4812,3 +4812,12 @@ def test_from_records() -> None:
         ),
         pd.DataFrame,
     )
+
+
+def test_frame_index_setter() -> None:
+    """Test DataFrame.index setter property GH1366."""
+    df = pd.DataFrame(data={"col1": [1, 2], "col2": [3, 4]})
+
+    check(assert_type(df.index, pd.Index), pd.Index)
+    df.index = [2, 3]
+    check(assert_type(df.index, pd.Index), pd.Index)

tests/test_testing.py

@@ -10,6 +10,7 @@
 from typing_extensions import assert_type
 
 from tests import (
+    PD_LTE_23,
     TYPE_CHECKING_INVALID_USAGE,
     check,
     ensure_clean,
@@ -20,14 +21,23 @@ def test_types_assert_series_equal() -> None:
     s1 = pd.Series([0, 1, 1, 0])
     s2 = pd.Series([0, 1, 1, 0])
     assert_series_equal(left=s1, right=s2)
-    assert_series_equal(
-        s1,
-        s2,
-        check_freq=False,
-        check_categorical=True,
-        check_flags=True,
-        check_datetimelike_compat=True,
-    )
+    if PD_LTE_23:
+        assert_series_equal(
+            s1,
+            s2,
+            check_freq=False,
+            check_categorical=True,
+            check_flags=True,
+            check_datetimelike_compat=True,
+        )
+    else:
+        assert_series_equal(
+            s1,
+            s2,
+            check_freq=False,
+            check_categorical=True,
+            check_flags=True,
+        )
     if TYPE_CHECKING_INVALID_USAGE:
         assert_series_equal(  # type: ignore[call-overload] # pyright: ignore[reportCallIssue]
             s1,

tests/test_timefuncs.py

@@ -200,8 +200,12 @@ def test_timestamp_timedelta_series_arithmetic() -> None:
     check(assert_type(r4, "pd.Series[float]"), pd.Series, float)
     sb = pd.Series([1, 2]) == pd.Series([1, 3])
     check(assert_type(sb, "pd.Series[bool]"), pd.Series, np.bool_)
-    r5 = sb * r1
-    check(assert_type(r5, "pd.Series[pd.Timedelta]"), pd.Series, pd.Timedelta)
+
+    # https://github.com/pandas-dev/pandas/issues/62316
+    if PD_LTE_23:
+        r5 = sb * r1
+        check(assert_type(r5, "pd.Series[pd.Timedelta]"), pd.Series, pd.Timedelta)
+
     r6 = r1 * 4
     check(assert_type(r6, "TimedeltaSeries"), pd.Series, pd.Timedelta)