Skip to content

Commit 9980c3b

Browse files
authored
fix nightly tests (#1368)
1 parent 339ef39 commit 9980c3b

File tree

4 files changed

+25
-12
lines changed

4 files changed

+25
-12
lines changed

scripts/test/run.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ def nightly_pandas():
9494
"pip",
9595
"install",
9696
"--pre",
97-
"--use-deprecated=legacy-resolver",
9897
"--upgrade",
9998
"--extra-index-url",
10099
"https://pypi.anaconda.org/scientific-python-nightly-wheels/simple",

tests/test_frame.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4650,7 +4650,7 @@ def test_unstack() -> None:
46504650
df_flt = pd.DataFrame(
46514651
[
46524652
["a", "b", 1],
4653-
["a", "a", 12],
4653+
["a", "a", 12.2],
46544654
["b", "b", 14],
46554655
]
46564656
).set_index([0, 1])

tests/test_testing.py

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from typing_extensions import assert_type
1111

1212
from tests import (
13+
PD_LTE_23,
1314
TYPE_CHECKING_INVALID_USAGE,
1415
check,
1516
ensure_clean,
@@ -20,14 +21,23 @@ def test_types_assert_series_equal() -> None:
2021
s1 = pd.Series([0, 1, 1, 0])
2122
s2 = pd.Series([0, 1, 1, 0])
2223
assert_series_equal(left=s1, right=s2)
23-
assert_series_equal(
24-
s1,
25-
s2,
26-
check_freq=False,
27-
check_categorical=True,
28-
check_flags=True,
29-
check_datetimelike_compat=True,
30-
)
24+
if PD_LTE_23:
25+
assert_series_equal(
26+
s1,
27+
s2,
28+
check_freq=False,
29+
check_categorical=True,
30+
check_flags=True,
31+
check_datetimelike_compat=True,
32+
)
33+
else:
34+
assert_series_equal(
35+
s1,
36+
s2,
37+
check_freq=False,
38+
check_categorical=True,
39+
check_flags=True,
40+
)
3141
if TYPE_CHECKING_INVALID_USAGE:
3242
assert_series_equal( # type: ignore[call-overload] # pyright: ignore[reportCallIssue]
3343
s1,

tests/test_timefuncs.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,12 @@ def test_timestamp_timedelta_series_arithmetic() -> None:
203203
check(assert_type(r4, "pd.Series[float]"), pd.Series, float)
204204
sb = pd.Series([1, 2]) == pd.Series([1, 3])
205205
check(assert_type(sb, "pd.Series[bool]"), pd.Series, np.bool_)
206-
r5 = sb * r1
207-
check(assert_type(r5, "TimedeltaSeries"), pd.Series, pd.Timedelta)
206+
207+
# https://github.com/pandas-dev/pandas/issues/62316
208+
if PD_LTE_23:
209+
r5 = sb * r1
210+
check(assert_type(r5, "TimedeltaSeries"), pd.Series, pd.Timedelta)
211+
208212
r6 = r1 * 4
209213
check(assert_type(r6, "TimedeltaSeries"), pd.Series, pd.Timedelta)
210214

0 commit comments

Comments
 (0)