Skip to content

Commit 9b8a51c

Browse files
PR feedback
1 parent ebaefb7 commit 9b8a51c

File tree

4 files changed

+19
-6
lines changed

4 files changed

+19
-6
lines changed

tests/series/test_series.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@
9898
TimestampSeries: TypeAlias = pd.Series
9999
OffsetSeries: TypeAlias = pd.Series
100100

101+
if not PD_LTE_23:
102+
from pandas.errors import Pandas4Warning # type: ignore[attr-defined] # pyright: ignore # isort: skip
103+
else:
104+
Pandas4Warning: TypeAlias = FutureWarning # type: ignore[no-redef]
101105

102106
# Tests will use numpy 2.1 in python 3.10 or later
103107
# From Numpy 2.1 __init__.pyi
@@ -3863,7 +3867,7 @@ def test_series_reindex_like() -> None:
38633867
upper="2.99",
38643868
),
38653869
pytest_warns_bounded(
3866-
Warning, # should be Pandas4Warning but only exposed starting pandas 3.0.0
3870+
Pandas4Warning,
38673871
"the 'method' keyword is deprecated and will be removed in a future version. Please take steps to stop the use of 'method'",
38683872
lower="2.99",
38693873
upper="3.0.99",

tests/test_frame.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@
7272
else:
7373
_PandasNamedTuple: TypeAlias = tuple
7474

75+
if not PD_LTE_23:
76+
from pandas.errors import Pandas4Warning # type: ignore[attr-defined] # pyright: ignore # isort: skip
77+
else:
78+
Pandas4Warning: TypeAlias = FutureWarning # type: ignore[no-redef]
79+
7580
DF = pd.DataFrame(data={"col1": [1, 2], "col2": [3, 4]})
7681

7782

@@ -3262,7 +3267,7 @@ def test_frame_reindex_like() -> None:
32623267
upper="2.99",
32633268
),
32643269
pytest_warns_bounded(
3265-
Warning, # should be Pandas4Warning but only exposed starting pandas 3.0.0
3270+
Pandas4Warning,
32663271
"the 'method' keyword is deprecated and will be removed in a future version. Please take steps to stop the use of 'method'",
32673272
lower="2.99",
32683273
upper="3.0.99",

tests/test_indexes.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,9 +1372,8 @@ def test_datetimeindex_shift() -> None:
13721372

13731373
def test_timedeltaindex_shift() -> None:
13741374
ind = pd.date_range("1/1/2021", "1/5/2021") - pd.Timestamp("1/3/2019")
1375-
if PD_LTE_23:
1376-
# cannot shift with no freq starting in pandas 3.0.0
1377-
check(assert_type(ind.shift(1), pd.TimedeltaIndex), pd.TimedeltaIndex)
1375+
# broken on 3.0.0.dev0 as of 20250813, fix with pandas-dev/pandas/issues/62094
1376+
check(assert_type(ind.shift(1), pd.TimedeltaIndex), pd.TimedeltaIndex)
13781377

13791378

13801379
def test_index_insert() -> None:

tests/test_timefuncs.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@
5656
else:
5757
TimestampSeries: TypeAlias = pd.Series
5858

59+
if not PD_LTE_23:
60+
from pandas.errors import Pandas4Warning # type: ignore[attr-defined] # pyright: ignore # isort: skip
61+
else:
62+
Pandas4Warning: TypeAlias = FutureWarning # type: ignore[no-redef]
63+
5964
from tests import np_ndarray_bool
6065

6166

@@ -549,7 +554,7 @@ def test_series_dt_accessors() -> None:
549554
upper="2.99",
550555
),
551556
pytest_warns_bounded(
552-
Warning, # should be Pandas4Warning but only exposed starting pandas 3.0.0
557+
Pandas4Warning, # should be Pandas4Warning but only exposed starting pandas 3.0.0
553558
"The behavior of TimedeltaProperties.to_pytimedelta is deprecated",
554559
lower="2.99",
555560
upper="3.0.99",

0 commit comments

Comments
 (0)