Add another check to handle pandas 1.3+ in hv/core/utils.py, and reve…

…rt the install_requires to what is what before #4976 (#5013) Co-authored-by: kgullikson <kgullikson@sparkcognition.com>
holoviz · Jul 13, 2021 · 2cdb539 · 2cdb539
1 parent 942c5ac
commit 2cdb539
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -16,7 +16,7 @@
     "pyviz_comms >=0.7.4",
     "panel >=0.9.5",
     "colorcet",
-    "pandas <1.3.0",
+    "pandas >=0.20.0",
 ]
 
 extras_require = {}