diff --git a/scripts/test/run.py b/scripts/test/run.py index 7a93ae435..c6ecde1e2 100644 --- a/scripts/test/run.py +++ b/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", diff --git a/tests/test_frame.py b/tests/test_frame.py index b72d0a80b..b9390f2bb 100644 --- a/tests/test_frame.py +++ b/tests/test_frame.py @@ -4650,7 +4650,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]) diff --git a/tests/test_testing.py b/tests/test_testing.py index c4ca7a876..2ca593af7 100644 --- a/tests/test_testing.py +++ b/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, diff --git a/tests/test_timefuncs.py b/tests/test_timefuncs.py index 559f98e20..7e74fa8fd 100644 --- a/tests/test_timefuncs.py +++ b/tests/test_timefuncs.py @@ -203,8 +203,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, "TimedeltaSeries"), pd.Series, pd.Timedelta) + + # https://github.com/pandas-dev/pandas/issues/62316 + if PD_LTE_23: + r5 = sb * r1 + check(assert_type(r5, "TimedeltaSeries"), pd.Series, pd.Timedelta) + r6 = r1 * 4 check(assert_type(r6, "TimedeltaSeries"), pd.Series, pd.Timedelta)