|
17 | 17 |
|
18 | 18 | import cudf
|
19 | 19 | from cudf import read_csv
|
20 |
| -from cudf.core._compat import PANDAS_GE_200 |
21 |
| -from cudf.testing._utils import assert_eq, assert_exceptions_equal |
| 20 | +from cudf.core._compat import PANDAS_GE_200, PANDAS_GE_220 |
| 21 | +from cudf.testing._utils import ( |
| 22 | + assert_eq, |
| 23 | + assert_exceptions_equal, |
| 24 | + expect_warning_if, |
| 25 | +) |
22 | 26 |
|
23 | 27 |
|
24 | 28 | def make_numeric_dataframe(nrows, dtype):
|
@@ -1263,20 +1267,28 @@ def test_csv_reader_delim_whitespace():
|
1263 | 1267 | buffer = "1 2 3\n4 5 6"
|
1264 | 1268 |
|
1265 | 1269 | # with header row
|
1266 |
| - cu_df = read_csv(StringIO(buffer), delim_whitespace=True) |
1267 |
| - pd_df = pd.read_csv(StringIO(buffer), delim_whitespace=True) |
| 1270 | + with pytest.warns(FutureWarning): |
| 1271 | + cu_df = read_csv(StringIO(buffer), delim_whitespace=True) |
| 1272 | + with expect_warning_if(PANDAS_GE_220): |
| 1273 | + pd_df = pd.read_csv(StringIO(buffer), delim_whitespace=True) |
1268 | 1274 | assert_eq(pd_df, cu_df)
|
1269 | 1275 |
|
1270 | 1276 | # without header row
|
1271 |
| - cu_df = read_csv(StringIO(buffer), delim_whitespace=True, header=None) |
1272 |
| - pd_df = pd.read_csv(StringIO(buffer), delim_whitespace=True, header=None) |
| 1277 | + with pytest.warns(FutureWarning): |
| 1278 | + cu_df = read_csv(StringIO(buffer), delim_whitespace=True, header=None) |
| 1279 | + with expect_warning_if(PANDAS_GE_220): |
| 1280 | + pd_df = pd.read_csv( |
| 1281 | + StringIO(buffer), delim_whitespace=True, header=None |
| 1282 | + ) |
1273 | 1283 | assert pd_df.shape == cu_df.shape
|
1274 | 1284 |
|
1275 | 1285 | # should raise an error if used with delimiter or sep
|
1276 | 1286 | with pytest.raises(ValueError):
|
1277 |
| - read_csv(StringIO(buffer), delim_whitespace=True, delimiter=" ") |
| 1287 | + with pytest.warns(FutureWarning): |
| 1288 | + read_csv(StringIO(buffer), delim_whitespace=True, delimiter=" ") |
1278 | 1289 | with pytest.raises(ValueError):
|
1279 |
| - read_csv(StringIO(buffer), delim_whitespace=True, sep=" ") |
| 1290 | + with pytest.warns(FutureWarning): |
| 1291 | + read_csv(StringIO(buffer), delim_whitespace=True, sep=" ") |
1280 | 1292 |
|
1281 | 1293 |
|
1282 | 1294 | def test_csv_reader_unnamed_cols():
|
|
0 commit comments