Skip to content

Commit 9288d5c

Browse files
TomAugspurgerjcrist
authored andcommitted
TST/COMPAT: Catch warnings for new pytest (dask#2370)
Compat for newer pandas moving is_datetime64tz import
1 parent 1eb968b commit 9288d5c

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

dask/dataframe/io/tests/test_csv.py

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -422,23 +422,26 @@ def test_read_csv_compression(fmt, blocksize):
422422
expected.reset_index(drop=True), check_dtype=False)
423423

424424

425-
def test_warn_non_seekable_files(capsys):
425+
def test_warn_non_seekable_files():
426426
files2 = valmap(compress['gzip'], csv_files)
427427
with filetexts(files2, mode='b'):
428428

429-
# with tm.assert_produces_warning(UserWarning):
430-
df = dd.read_csv('2014-01-*.csv', compression='gzip')
431-
assert df.npartitions == 3
432-
out, err = capsys.readouterr()
433-
assert 'gzip' in err
434-
assert 'blocksize=None' in err
429+
with pytest.warns(UserWarning) as w:
430+
df = dd.read_csv('2014-01-*.csv', compression='gzip')
431+
assert df.npartitions == 3
435432

436-
df = dd.read_csv('2014-01-*.csv', compression='gzip', blocksize=None)
437-
out, err = capsys.readouterr()
438-
assert not err and not out
433+
assert len(w) == 1
434+
msg = str(w[0].message)
435+
assert 'gzip' in msg
436+
assert 'blocksize=None' in msg
437+
438+
with pytest.warns(None) as w:
439+
df = dd.read_csv('2014-01-*.csv', compression='gzip', blocksize=None)
440+
assert len(w) == 0
439441

440442
with pytest.raises(NotImplementedError):
441-
df = dd.read_csv('2014-01-*.csv', compression='foo')
443+
with pytest.warns(None):
444+
df = dd.read_csv('2014-01-*.csv', compression='foo')
442445

443446

444447
def test_windows_line_terminator():

dask/dataframe/tests/test_categorical.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import operator
2-
import warnings
32

43
import numpy as np
54
import pandas as pd
@@ -234,7 +233,7 @@ def test_categorical_accessor_presence():
234233
def test_categorize_nan():
235234
df = dd.from_pandas(pd.DataFrame({"A": ['a', 'b', 'a', float('nan')]}),
236235
npartitions=2)
237-
with warnings.catch_warnings(record=True) as record:
236+
with pytest.warns(None) as record:
238237
df.categorize().compute()
239238
assert len(record) == 0
240239

dask/dataframe/utils.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@
1212
import numpy as np
1313
import pandas as pd
1414
import pandas.util.testing as tm
15-
from pandas.core.common import is_datetime64tz_dtype
1615
from pandas.api.types import is_categorical_dtype, is_scalar
16+
try:
17+
from pandas.api.types import is_datetime64tz_dtype
18+
except ImportError:
19+
# pandas < 0.19.2
20+
from pandas.core.common import is_datetime64tz_dtype
1721

1822
from ..core import get_deps
1923
from ..local import get_sync

0 commit comments

Comments
 (0)