From 50d88adf371b489632f488bf9d4a139c3f84979a426fbb6f2f51c1072637534a Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 17 May 2018 19:38:43 +0000 Subject: [PATCH] Accepting request 610151 from home:TheBlackCat:branches:devel:languages:python - 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 --- python-tqdm.changes | 50 +++++++++++++++++++++++++++++++++ python-tqdm.spec | 22 +++++++-------- support_pandas_23_groupby.patch | 42 +++++++++++++++++++++++++++ tqdm-4.19.8.tar.gz | 3 -- tqdm-4.23.3.tar.gz | 3 ++ 5 files changed, 106 insertions(+), 14 deletions(-) create mode 100644 support_pandas_23_groupby.patch delete mode 100644 tqdm-4.19.8.tar.gz create mode 100644 tqdm-4.23.3.tar.gz diff --git a/python-tqdm.changes b/python-tqdm.changes index efbec22..6d77135 100644 --- a/python-tqdm.changes +++ b/python-tqdm.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Thu May 17 18:52:40 UTC 2018 - toddrme2178@gmail.com + +- 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 + + ------------------------------------------------------------------- Sat Mar 17 19:27:52 UTC 2018 - arun@gmx.de diff --git a/python-tqdm.spec b/python-tqdm.spec index f10230c..38e8e7d 100644 --- a/python-tqdm.spec +++ b/python-tqdm.spec @@ -15,18 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%bcond_without test +%bcond_without test +%define oldpython python Name: python-tqdm -Version: 4.19.8 +Version: 4.23.3 Release: 0 Summary: An extensible progress meter License: MPL-2.0 AND MIT Group: Development/Languages/Python Url: https://github.com/tqdm/tqdm Source: https://files.pythonhosted.org/packages/source/t/tqdm/tqdm-%{version}.tar.gz +# PATCH-FIX-UPSTREAM support_pandas_23_groupby.patch https://github.com/tqdm/tqdm/pull/554 +Patch0: support_pandas_23_groupby.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module rpm-macros} BuildRequires: %{python_module setuptools} @@ -41,7 +42,6 @@ BuildRequires: %{python_module pandas} # /SECTION Requires(post): update-alternatives Requires(postun): update-alternatives -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %python_subpackages @@ -54,6 +54,7 @@ and does not require ncurses. %prep %setup -q -n tqdm-%{version} +%patch0 -p1 # fix installation directory for man pages sed -i 's#man/man1#share/man/man1#' setup.py @@ -74,17 +75,16 @@ sed -i 's#man/man1#share/man/man1#' setup.py %if %{with test} %check -%python_exec %{_bindir}/nosetests --ignore-files="tests_perf\.py" +%{python_expand export PATH="$PATH:%{buildroot}%{_bindir}" +nosetests-%{$python_bin_suffix} --ignore-files="tests_perf\.py" --ignore-files="tests_synchronisation\.py" tqdm/ +} %endif %files %{python_files} %defattr(-,root,root,-) -%doc README.rst logo.png examples -%if 0%{?leap_version} >= 420200 || 0%{?suse_version} > 1320 +%doc README.rst logo.png +%doc examples/ %license LICENCE -%else -%doc LICENCE -%endif %{python_sitelib}/* %python_alternative %{_bindir}/tqdm %python_alternative %{_mandir}/man1/tqdm.1 diff --git a/support_pandas_23_groupby.patch b/support_pandas_23_groupby.patch new file mode 100644 index 0000000..6b08457 --- /dev/null +++ b/support_pandas_23_groupby.patch @@ -0,0 +1,42 @@ +From f22f9ed3bb224df538f438aa365dce3616e5cd50 Mon Sep 17 00:00:00 2001 +From: toddrme2178 +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)] + diff --git a/tqdm-4.19.8.tar.gz b/tqdm-4.19.8.tar.gz deleted file mode 100644 index 0950a74..0000000 --- a/tqdm-4.19.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2aea9f81fdf127048667e0ba22f5fc10ebc879fb838dc52dcf055242037ec1f7 -size 95367 diff --git a/tqdm-4.23.3.tar.gz b/tqdm-4.23.3.tar.gz new file mode 100644 index 0000000..7f1e3b5 --- /dev/null +++ b/tqdm-4.23.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce205451a27b6050faed0bb2bcbea96c6a550f8c27cd2b5441d72e948113ad18 +size 99299