Skip to content

Commit

Permalink
Pandas import (#284)
Browse files Browse the repository at this point in the history
* import from official pandas api

* remove categoricaldtype altogether

* rleax pandas version

Since no longer using CategoricalDType
  • Loading branch information
martindurant committed Jan 22, 2018
1 parent ddea5b7 commit 96b8b0e
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions fastparquet/dataframe.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
import numpy as np
from pandas.core.index import _ensure_index, CategoricalIndex, Index
from pandas.core.internals import BlockManager, _block_shape
from pandas.core.generic import NDFrame
from pandas import Categorical
from pandas.core.frame import DataFrame
from pandas.core.index import RangeIndex, Index
from pandas.core.categorical import Categorical, CategoricalDtype
try:
from pandas.api.types import is_categorical_dtype
except ImportError:
# Pandas <= 0.18.1
from pandas.core.common import is_categorical_dtype
from pandas.api.types import is_categorical_dtype
from .util import STR_TYPE


Expand Down

0 comments on commit 96b8b0e

Please sign in to comment.