Rooba
/
tqdm
mirror of https://github.com/tqdm/tqdm.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix pandas.window.(Rolling|Expanding).progress_apply 

- fixes #1106 pandas==1.2.0
This commit is contained in:
Casper da Costa-Luis 2021-01-02 16:12:13 +00:00
parent 46500b193c
commit 845805cdce
No known key found for this signature in database
GPG Key ID: 986B408043AE090D
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tqdm/std.py
View File

@ -701,12 +701,18 @@ class tqdm(Comparable):
from pandas import Panel from pandas import Panel
except ImportError: # TODO: pandas>0.25.2 except ImportError: # TODO: pandas>0.25.2
Panel = None Panel = None
Rolling, Expanding = None, None
try: # pandas>=1.0.0 try: # pandas>=1.0.0
from pandas.core.window.rolling import _Rolling_and_Expanding from pandas.core.window.rolling import _Rolling_and_Expanding
except ImportError: except ImportError:
try: # pandas>=0.18.0 try: # pandas>=0.18.0
from pandas.core.window import _Rolling_and_Expanding from pandas.core.window import _Rolling_and_Expanding
except ImportError: # pragma: no cover except ImportError: # pandas>=1.2.0
try: # pandas>=1.2.0
from pandas.core.window.rolling import Rolling
from pandas.core.window.expanding import Expanding
_Rolling_and_Expanding = Rolling, Expanding
except ImportError:
_Rolling_and_Expanding = None _Rolling_and_Expanding = None
try: # pandas>=0.25.0 try: # pandas>=0.25.0
from pandas.core.groupby.generic import DataFrameGroupBy, \ from pandas.core.groupby.generic import DataFrameGroupBy, \
@ -824,7 +830,10 @@ class tqdm(Comparable):
GroupBy.progress_aggregate = inner_generator('aggregate') GroupBy.progress_aggregate = inner_generator('aggregate')
GroupBy.progress_transform = inner_generator('transform') GroupBy.progress_transform = inner_generator('transform')
if _Rolling_and_Expanding is not None: # pragma: no cover if Rolling is not None and Expanding is not None:
Rolling.progress_apply = inner_generator()
Expanding.progress_apply = inner_generator()
elif _Rolling_and_Expanding is not None:
_Rolling_and_Expanding.progress_apply = inner_generator() _Rolling_and_Expanding.progress_apply = inner_generator()
def __init__(self, iterable=None, desc=None, total=None, leave=True, file=None, def __init__(self, iterable=None, desc=None, total=None, leave=True, file=None,