From 2e10072f09701abe5276414cc390c5c175e68686 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 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/holoviews/core/util.py b/holoviews/core/util.py index d476eb860e..194882f42b 100644 --- a/holoviews/core/util.py +++ b/holoviews/core/util.py @@ -83,7 +83,10 @@ def __cmp__(self, other): 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':