From 0fcf9ed4c191fa224afd5581ac1a47b2cf80bc54 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Fri, 31 Jan 2020 21:56:50 +0000 Subject: [PATCH] pandas: support v1.0.0 - fixes #555 (again) - fixes #780 (again) --- tqdm/std.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tqdm/std.py b/tqdm/std.py index 14ab11a0..05dafff8 100644 --- a/tqdm/std.py +++ b/tqdm/std.py @@ -658,10 +658,13 @@ class tqdm(Comparable): from pandas import Panel except ImportError: # TODO: pandas>0.25.2 Panel = None - try: # pandas>=0.18.0 - from pandas.core.window import _Rolling_and_Expanding - except ImportError: # pragma: no cover - _Rolling_and_Expanding = None + try: # pandas>=1.0.0 + from pandas.core.window.rolling import _Rolling_and_Expanding + except ImportError: + try: # pandas>=0.18.0 + from pandas.core.window import _Rolling_and_Expanding + except ImportError: # pragma: no cover + _Rolling_and_Expanding = None try: # pandas>=0.25.0 from pandas.core.groupby.generic import DataFrameGroupBy, \ SeriesGroupBy # , NDFrameGroupBy