diff --git a/requirements.txt b/requirements.txt index 836500bb8..d04421ac7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -51,7 +51,7 @@ marshmallow-enum==1.4.1 # via flask-appbuilder marshmallow-sqlalchemy==0.16.2 # via flask-appbuilder marshmallow==2.19.2 # via flask-appbuilder, marshmallow-enum, marshmallow-sqlalchemy numpy==1.15.2 # via pandas -pandas==0.23.4 +pandas==0.24.2 parsedatetime==2.0.0 pathlib2==2.3.0 polyline==1.3.2 diff --git a/setup.py b/setup.py index 584cbfe50..be11cffd2 100644 --- a/setup.py +++ b/setup.py @@ -85,7 +85,7 @@ setup( "idna", "isodate", "markdown>=3.0", - "pandas>=0.18.0, <0.24.0", # `pandas`>=0.24.0 changes datetimelike API + "pandas>=0.24.2, <0.25.0", "parsedatetime", "pathlib2", "polyline", diff --git a/superset/dataframe.py b/superset/dataframe.py index 61a491f2c..13bd6ace8 100644 --- a/superset/dataframe.py +++ b/superset/dataframe.py @@ -27,7 +27,7 @@ import logging import numpy as np import pandas as pd -from pandas.core.common import _maybe_box_datetimelike +from pandas.core.common import maybe_box_datetimelike from pandas.core.dtypes.dtypes import ExtensionDtype from superset.utils.core import JS_MAX_INTEGER @@ -109,7 +109,7 @@ class SupersetDataFrame(object): # work around for https://github.com/pandas-dev/pandas/issues/18372 data = [ dict( - (k, _maybe_box_datetimelike(v)) + (k, maybe_box_datetimelike(v)) for k, v in zip(self.df.columns, np.atleast_1d(row)) ) for row in self.df.values