diff --git a/pandas.patch b/pandas.patch new file mode 100644 index 0000000..d5adf12 --- /dev/null +++ b/pandas.patch @@ -0,0 +1,13 @@ +Index: tqdm-4.56.0/tqdm/std.py +=================================================================== +--- tqdm-4.56.0.orig/tqdm/std.py ++++ tqdm-4.56.0/tqdm/std.py +@@ -702,6 +702,8 @@ class tqdm(Comparable): + from pandas import Panel + except ImportError: # TODO: pandas>0.25.2 + Panel = None ++ except FutureWarning: ++ Panel = None + Rolling, Expanding = None, None + try: # pandas>=1.0.0 + from pandas.core.window.rolling import _Rolling_and_Expanding diff --git a/python-tqdm.changes b/python-tqdm.changes index 342cbbf..22bd352 100644 --- a/python-tqdm.changes +++ b/python-tqdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 13 10:15:20 UTC 2021 - Markéta Machová + +- Update to 4.56.0 + * some tqdm.gui improvements +- Fix testsuite with pandas.patch + ------------------------------------------------------------------- Sun Jan 10 20:21:47 UTC 2021 - andy great diff --git a/python-tqdm.spec b/python-tqdm.spec index 8477b8f..e6700f4 100644 --- a/python-tqdm.spec +++ b/python-tqdm.spec @@ -28,12 +28,13 @@ %bcond_with test %endif Name: python-tqdm%{pkg_suffix} -Version: 4.55.2 +Version: 4.56.0 Release: 0 Summary: An extensible progress meter License: MPL-2.0 AND MIT URL: https://github.com/tqdm/tqdm Source: https://files.pythonhosted.org/packages/source/t/tqdm/tqdm-%{version}.tar.gz +Patch0: pandas.patch BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module toml} @@ -46,8 +47,9 @@ BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module numpy} BuildRequires: %{python_module pandas} -BuildRequires: %{python_module pytest} +BuildRequires: %{python_module pytest-asyncio} BuildRequires: %{python_module pytest-timeout} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module tqdm} BuildRequires: python3-ipython BuildRequires: python3-ipywidgets @@ -77,6 +79,7 @@ This package provides the completion file for bash %prep %setup -q -n tqdm-%{version} +%patch0 -p1 # remove bash shebang for completion script sed -i '1 s/^#!.*/# bash completion for tqdm -*- shell-script -*-/' tqdm/completion.sh chmod a-x tqdm/completion.sh @@ -104,10 +107,7 @@ install -m 644 -D tqdm/completion.sh %{buildroot}%{_datadir}/bash-completion/com %check # test_perf: flaky # test_synchronisation: hangs -# test_main: todo upstream, TypeError: a bytes-like object is required, not 'str' -# also disabled in https://github.com/tqdm/tqdm/pull/1052 -# and left upstream to solve -%pytest -k "not (tests_perf or tests_synchronisation or test_main)" tqdm/ +%pytest -k "not (tests_perf or tests_synchronisation)" %endif %if !%{with test} diff --git a/tqdm-4.55.2.tar.gz b/tqdm-4.55.2.tar.gz deleted file mode 100644 index cacc8db..0000000 --- a/tqdm-4.55.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86ca00c4942c3b3dc7ed31bae44cd2db38ef85ca05a7920f6a6c52ad7fcac904 -size 162632 diff --git a/tqdm-4.56.0.tar.gz b/tqdm-4.56.0.tar.gz new file mode 100644 index 0000000..2d3b7b6 --- /dev/null +++ b/tqdm-4.56.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe3d08dd00a526850568d542ff9de9bbc2a09a791da3c334f3213d8d0bbbca65 +size 166848