Skip to content

Commit 3523b7b

Browse files
committed
Fix tests expecting a DeprecationWarning that is not raised
1 parent 9093962 commit 3523b7b

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

pandas/tests/io/parser/common/test_inf.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ def test_read_csv_with_use_inf_as_na(all_parsers):
6868
data = "1.0\nNaN\n3.0"
6969
msg = "use_inf_as_na option is deprecated"
7070
warn = FutureWarning
71-
if parser.engine == "pyarrow":
72-
warn = (FutureWarning, DeprecationWarning)
7371

7472
with tm.assert_produces_warning(warn, match=msg, check_stacklevel=False):
7573
with option_context("use_inf_as_na", True):

pandas/tests/io/parser/common/test_read_errors.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ def test_warn_bad_lines(all_parsers):
192192
expected_warning = ParserWarning
193193
if parser.engine == "pyarrow":
194194
match_msg = "Expected 1 columns, but found 3: 1,2,3"
195-
expected_warning = (ParserWarning, DeprecationWarning)
196195

197196
with tm.assert_produces_warning(
198197
expected_warning, match=match_msg, check_stacklevel=False
@@ -311,7 +310,6 @@ def test_on_bad_lines_warn_correct_formatting(all_parsers):
311310
expected_warning = ParserWarning
312311
if parser.engine == "pyarrow":
313312
match_msg = "Expected 2 columns, but found 3: a,b,c"
314-
expected_warning = (ParserWarning, DeprecationWarning)
315313

316314
with tm.assert_produces_warning(
317315
expected_warning, match=match_msg, check_stacklevel=False

pandas/tests/io/parser/test_parse_dates.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ def test_multiple_date_col(all_parsers, keep_date_col, request):
343343
"names": ["X0", "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8"],
344344
}
345345
with tm.assert_produces_warning(
346-
(DeprecationWarning, FutureWarning), match=depr_msg, check_stacklevel=False
346+
FutureWarning, match=depr_msg, check_stacklevel=False
347347
):
348348
result = parser.read_csv(StringIO(data), **kwds)
349349

@@ -724,7 +724,7 @@ def test_multiple_date_col_name_collision(all_parsers, data, parse_dates, msg):
724724
)
725725
with pytest.raises(ValueError, match=msg):
726726
with tm.assert_produces_warning(
727-
(FutureWarning, DeprecationWarning), match=depr_msg, check_stacklevel=False
727+
FutureWarning, match=depr_msg, check_stacklevel=False
728728
):
729729
parser.read_csv(StringIO(data), parse_dates=parse_dates)
730730

@@ -1248,14 +1248,14 @@ def test_multiple_date_col_named_index_compat(all_parsers):
12481248
"Support for nested sequences for 'parse_dates' in pd.read_csv is deprecated"
12491249
)
12501250
with tm.assert_produces_warning(
1251-
(FutureWarning, DeprecationWarning), match=depr_msg, check_stacklevel=False
1251+
FutureWarning, match=depr_msg, check_stacklevel=False
12521252
):
12531253
with_indices = parser.read_csv(
12541254
StringIO(data), parse_dates={"nominal": [1, 2]}, index_col="nominal"
12551255
)
12561256

12571257
with tm.assert_produces_warning(
1258-
(FutureWarning, DeprecationWarning), match=depr_msg, check_stacklevel=False
1258+
FutureWarning, match=depr_msg, check_stacklevel=False
12591259
):
12601260
with_names = parser.read_csv(
12611261
StringIO(data),
@@ -1280,13 +1280,13 @@ def test_multiple_date_col_multiple_index_compat(all_parsers):
12801280
"Support for nested sequences for 'parse_dates' in pd.read_csv is deprecated"
12811281
)
12821282
with tm.assert_produces_warning(
1283-
(FutureWarning, DeprecationWarning), match=depr_msg, check_stacklevel=False
1283+
FutureWarning, match=depr_msg, check_stacklevel=False
12841284
):
12851285
result = parser.read_csv(
12861286
StringIO(data), index_col=["nominal", "ID"], parse_dates={"nominal": [1, 2]}
12871287
)
12881288
with tm.assert_produces_warning(
1289-
(FutureWarning, DeprecationWarning), match=depr_msg, check_stacklevel=False
1289+
FutureWarning, match=depr_msg, check_stacklevel=False
12901290
):
12911291
expected = parser.read_csv(StringIO(data), parse_dates={"nominal": [1, 2]})
12921292

@@ -2267,7 +2267,7 @@ def test_parse_dates_dict_format_two_columns(all_parsers, key, parse_dates):
22672267
"Support for nested sequences for 'parse_dates' in pd.read_csv is deprecated"
22682268
)
22692269
with tm.assert_produces_warning(
2270-
(FutureWarning, DeprecationWarning), match=depr_msg, check_stacklevel=False
2270+
FutureWarning, match=depr_msg, check_stacklevel=False
22712271
):
22722272
result = parser.read_csv(
22732273
StringIO(data), date_format={key: "%d- %m-%Y"}, parse_dates=parse_dates

pandas/tests/io/parser/usecols/test_parse_dates.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ def test_usecols_with_parse_dates4(all_parsers):
145145
"Support for nested sequences for 'parse_dates' in pd.read_csv is deprecated"
146146
)
147147
with tm.assert_produces_warning(
148-
(FutureWarning, DeprecationWarning), match=depr_msg, check_stacklevel=False
148+
FutureWarning, match=depr_msg, check_stacklevel=False
149149
):
150150
result = parser.read_csv(
151151
StringIO(data),
@@ -186,7 +186,7 @@ def test_usecols_with_parse_dates_and_names(all_parsers, usecols, names, request
186186
"Support for nested sequences for 'parse_dates' in pd.read_csv is deprecated"
187187
)
188188
with tm.assert_produces_warning(
189-
(FutureWarning, DeprecationWarning), match=depr_msg, check_stacklevel=False
189+
FutureWarning, match=depr_msg, check_stacklevel=False
190190
):
191191
result = parser.read_csv(
192192
StringIO(s), names=names, parse_dates=parse_dates, usecols=usecols

0 commit comments

Comments
 (0)