50d88adf37
- update to version 4.23.3 * suppress warning * update .github things - update to version 4.23.2 * minor import syntax fix #496 * re-fix nested overlaps #477 * update documentation and examples * code tidy and abstraction - update to version 4.23.1 * fix AttributeErrors (#546) > pos on initialisation (#323, #510 -> #544) > fp on write() (#383) * fix py34 CI * update documentation - update to version 4.23.0 * Fix disable=True whereiterable has no len() and is not None (#539) * Add ncols to specify tqdm_notebook bar width (#276 -> #292) * allow custom pandas total (#364 -> #535) * Add progress_apply for pandas.(Series|DataFrame).(rolling|expanding) (#530 -> #537) * unit tests, pep8 tidy * postfix non-dict documentation note - update to version 4.22.0 * allow direct non-string assignment to postfix member (lists, dicts, etc) (#382 -> #534) * documentation updates * unit tests - update to version 4.21.0 * fix #532 write() with manual position > more robust free position finding * add TqdmWarning base class * fix GUI __del__() > add TqdmExperimentalWarning * add, tidy & fix unit tests * documentation > wiki release notes > update contributors > fix 7zx example - update to version 4.20.0 * pandas wrapper: remove *args and add better total handling (#244, #299, #322, #366 -> #524) * document windows unicode know issues (#454) * suppress RuntimeError: Set changed size during iteration -> TqdmSynchronisationWarning - update to version 4.19.9: * fix monitor thread termination and update tests - Add support_pandas_23_groupby.patch * Fix for pandas 0.23.0 support * See: https://github.com/tqdm/tqdm/pull/554 OBS-URL: https://build.opensuse.org/request/show/610151 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tqdm?expand=0&rev=21
43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
From f22f9ed3bb224df538f438aa365dce3616e5cd50 Mon Sep 17 00:00:00 2001
|
|
From: toddrme2178 <toddrme2178@gmail.com>
|
|
Date: Thu, 17 May 2018 15:33:25 -0400
|
|
Subject: [PATCH] Support pandas 0.23.0 `core.groupby` module layout
|
|
|
|
`pandas.core.groupby` has been moved to `pandas.core.groupby.groupby` for pandas 0.23.0. See pandas pull request [#20506](https://github.com/pandas-dev/pandas/pull/20506).
|
|
---
|
|
tqdm/_tqdm.py | 15 +++++++++++----
|
|
1 file changed, 11 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/tqdm/_tqdm.py b/tqdm/_tqdm.py
|
|
index ff551c97..749d9928 100755
|
|
--- a/tqdm/_tqdm.py
|
|
+++ b/tqdm/_tqdm.py
|
|
@@ -539,16 +539,23 @@ def pandas(tclass, *targs, **tkwargs):
|
|
"""
|
|
from pandas.core.frame import DataFrame
|
|
from pandas.core.series import Series
|
|
- from pandas.core.groupby import DataFrameGroupBy
|
|
- from pandas.core.groupby import SeriesGroupBy
|
|
- from pandas.core.groupby import GroupBy
|
|
- from pandas.core.groupby import PanelGroupBy
|
|
from pandas import Panel
|
|
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.23.0
|
|
+ from pandas.core.groupby.groupby import DataFrameGroupBy
|
|
+ from pandas.core.groupby.groupby import SeriesGroupBy
|
|
+ from pandas.core.groupby.groupby import GroupBy
|
|
+ from pandas.core.groupby.groupby import PanelGroupBy
|
|
+ except ImportError:
|
|
+ from pandas.core.groupby import DataFrameGroupBy
|
|
+ from pandas.core.groupby import SeriesGroupBy
|
|
+ from pandas.core.groupby import GroupBy
|
|
+ from pandas.core.groupby import PanelGroupBy
|
|
|
|
deprecated_t = [tkwargs.pop('deprecated_t', None)]
|
|
|