From 2cdb5399e5dd09d7b940254532d80457a731180e Mon Sep 17 00:00:00 2001 From: Kevin Gullikson Date: Tue, 13 Jul 2021 06:52:27 -0500 Subject: [PATCH] Add another check to handle pandas 1.3+ in hv/core/utils.py, and revert the install_requires to what is what before https://github.com/holoviz/holoviews/pull/4976 (#5013) Co-authored-by: kgullikson --- holoviews/core/util.py | 5 ++++- setup.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/holoviews/core/util.py b/holoviews/core/util.py index c6fcedb61e..e90937a5c9 100644 --- a/holoviews/core/util.py +++ b/holoviews/core/util.py @@ -44,7 +44,10 @@ if pd: pandas_version = LooseVersion(pd.__version__) try: - if pandas_version >= '0.24.0': + if pandas_version >= '1.3.0': + from pandas.core.dtypes.dtypes import DatetimeTZDtype as DatetimeTZDtypeType + from pandas.core.dtypes.generic import ABCSeries, ABCIndex as ABCIndexClass + elif pandas_version >= '0.24.0': from pandas.core.dtypes.dtypes import DatetimeTZDtype as DatetimeTZDtypeType from pandas.core.dtypes.generic import ABCSeries, ABCIndexClass elif pandas_version > '0.20.0': diff --git a/setup.py b/setup.py index d4a45eb685..85613d5d9c 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ "pyviz_comms >=0.7.4", "panel >=0.9.5", "colorcet", - "pandas <1.3.0", + "pandas >=0.20.0", ] extras_require = {}