diff --git a/python-tqdm.changes b/python-tqdm.changes index 6d77135..d0c08a8 100644 --- a/python-tqdm.changes +++ b/python-tqdm.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Jul 14 02:18:53 UTC 2018 - arun@gmx.de + +- specfile: + * removed patch support_pandas_23_groupby.patch (included upstream) + * always run tests + +- update to version 4.23.4: + * Support pandas 0.23.0 core.groupby module layout (#555 -> #554) + * Add python_requires to help pip (#557) + * minor maintenance updates + + CI updates: drop travis py33 due to tox (tox-dev/tox#648) + + minor code tidy + ------------------------------------------------------------------- Thu May 17 18:52:40 UTC 2018 - toddrme2178@gmail.com diff --git a/python-tqdm.spec b/python-tqdm.spec index 38e8e7d..924b5f9 100644 --- a/python-tqdm.spec +++ b/python-tqdm.spec @@ -15,35 +15,30 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%bcond_without test %define oldpython python Name: python-tqdm -Version: 4.23.3 +Version: 4.23.4 Release: 0 Summary: An extensible progress meter License: MPL-2.0 AND MIT Group: Development/Languages/Python -Url: https://github.com/tqdm/tqdm +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} BuildRequires: fdupes BuildRequires: python-rpm-macros -# SECTION test requirements -%if %{with test} -BuildRequires: %{python_module nose} -BuildRequires: %{python_module numpy} -BuildRequires: %{python_module pandas} -%endif -# /SECTION Requires(post): update-alternatives Requires(postun): update-alternatives BuildArch: noarch - +# SECTION test requirements +BuildRequires: %{python_module nose} +BuildRequires: %{python_module numpy} +BuildRequires: %{python_module pandas} +# /SECTION %python_subpackages %description @@ -54,7 +49,6 @@ 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 @@ -73,15 +67,12 @@ sed -i 's#man/man1#share/man/man1#' setup.py %postun %python_uninstall_alternative tqdm -%if %{with test} %check %{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 %doc examples/ %license LICENCE diff --git a/support_pandas_23_groupby.patch b/support_pandas_23_groupby.patch deleted file mode 100644 index 6b08457..0000000 --- a/support_pandas_23_groupby.patch +++ /dev/null @@ -1,42 +0,0 @@ -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.23.3.tar.gz b/tqdm-4.23.3.tar.gz deleted file mode 100644 index 7f1e3b5..0000000 --- a/tqdm-4.23.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce205451a27b6050faed0bb2bcbea96c6a550f8c27cd2b5441d72e948113ad18 -size 99299 diff --git a/tqdm-4.23.4.tar.gz b/tqdm-4.23.4.tar.gz new file mode 100644 index 0000000..c75e48d --- /dev/null +++ b/tqdm-4.23.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77b8424d41b31e68f437c6dd9cd567aebc9a860507cb42fbd880a5f822d966fe +size 104725