Skip to content

Commit

Permalink
Merge pull request #198 from martindurant/remove_warnings
Browse files Browse the repository at this point in the history
remove warnings
  • Loading branch information
martindurant committed Aug 24, 2017
2 parents b1a3afa + 9925b27 commit 4843093
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 19 deletions.
3 changes: 0 additions & 3 deletions fastparquet/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import struct

import numpy as np
import warnings

from .core import read_thrift
from .thrift_structures import parquet_thrift
Expand Down Expand Up @@ -433,8 +432,6 @@ def categories(self):
# old track
vals = self.key_value_metadata.get("fastparquet.cats", None)
if vals:
warnings.warn('Regression warning: found category spec from '
'fastparquet <= 0.0.6')
return json.loads(vals)
else:
return {}
Expand Down
30 changes: 14 additions & 16 deletions fastparquet/test/test_output.py
Original file line number Diff line number Diff line change
Expand Up @@ -617,22 +617,20 @@ def test_autocat(tempdir):
assert out.dtypes['o'] == 'category'

# regression test
with pytest.warns(UserWarning) as w:
pf.fmd.key_value_metadata = [parquet_thrift.KeyValue(
key='fastparquet.cats', value='{"o": 2}')]
pf._set_attrs()
assert 'o' in pf.categories
assert pf.categories['o'] == 2
assert pf.dtypes['o'] == 'category'
out = pf.to_pandas()
assert out.dtypes['o'] == 'category'
out = pf.to_pandas(categories={})
assert str(out.dtypes['o']) != 'category'
out = pf.to_pandas(categories=['o'])
assert out.dtypes['o'] == 'category'
out = pf.to_pandas(categories={'o': 2})
assert out.dtypes['o'] == 'category'
assert 'Regression warning' in str(w.list[0].message)
pf.fmd.key_value_metadata = [parquet_thrift.KeyValue(
key='fastparquet.cats', value='{"o": 2}')]
pf._set_attrs()
assert 'o' in pf.categories
assert pf.categories['o'] == 2
assert pf.dtypes['o'] == 'category'
out = pf.to_pandas()
assert out.dtypes['o'] == 'category'
out = pf.to_pandas(categories={})
assert str(out.dtypes['o']) != 'category'
out = pf.to_pandas(categories=['o'])
assert out.dtypes['o'] == 'category'
out = pf.to_pandas(categories={'o': 2})
assert out.dtypes['o'] == 'category'


@pytest.mark.parametrize('row_groups', ([0], [0, 2]))
Expand Down

0 comments on commit 4843093

Please sign in to comment.