From 9e8341d5799b45e03443ddbc746ad2d03302a95948b2668094dec8322552c47a Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 29 Jul 2020 12:47:29 +0000 Subject: [PATCH 1/2] Accepting request 823009 from home:dmacvicar:branches:devel:languages:python - Update to v3.51.4 - Fix build (pytest) - initial version (btw, Leap 15.1 also builds when adding the :Update repository) OBS-URL: https://build.opensuse.org/request/show/823009 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-progressbar2?expand=0&rev=3 --- progressbar2-3.51.3.tar.gz | 3 --- progressbar2-3.51.4.tar.gz | 3 +++ python-progressbar2.changes | 8 +++++++- python-progressbar2.spec | 17 +++++++++-------- 4 files changed, 19 insertions(+), 12 deletions(-) delete mode 100644 progressbar2-3.51.3.tar.gz create mode 100644 progressbar2-3.51.4.tar.gz diff --git a/progressbar2-3.51.3.tar.gz b/progressbar2-3.51.3.tar.gz deleted file mode 100644 index f9407e2..0000000 --- a/progressbar2-3.51.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ecf687696dd449067f69ef6730c4d4a0189db1f8d1aad9e376358354631d5b2c -size 314478 diff --git a/progressbar2-3.51.4.tar.gz b/progressbar2-3.51.4.tar.gz new file mode 100644 index 0000000..4655c76 --- /dev/null +++ b/progressbar2-3.51.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13f228cf357f94cdef933c91c1e771e52e1b1931dbae48267be8fcdc2ae2ce36 +size 206005 diff --git a/python-progressbar2.changes b/python-progressbar2.changes index 953587a..de3ebe8 100644 --- a/python-progressbar2.changes +++ b/python-progressbar2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 25 09:43:04 UTC 2020 - Duncan Mac-Vicar + +- Update to v3.51.4 +- Fix build (pytest) + ------------------------------------------------------------------- Wed May 6 12:29:51 UTC 2020 - John Vandenberg @@ -11,4 +17,4 @@ Thu Jan 9 11:45:14 AM UTC 2020 - John Vandenberg ------------------------------------------------------------------- Fri Oct 20 16:17:18 UTC 2017 - toddrme2178@gmail.com -- initial version \ No newline at end of file +- initial version diff --git a/python-progressbar2.spec b/python-progressbar2.spec index be2da0e..99670d7 100644 --- a/python-progressbar2.spec +++ b/python-progressbar2.spec @@ -18,31 +18,29 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-progressbar2 -Version: 3.51.3 +Version: 3.51.4 Release: 0 -Summary: Python progressbar library +Summary: Python library to provide visual text-based progress to long running operations License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/WoLpH/python-progressbar Source: https://files.pythonhosted.org/packages/source/p/progressbar2/progressbar2-%{version}.tar.gz +BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-python-utils >= 2.3.0 Requires: python-six -Conflicts: python-progressbar -BuildArch: noarch # SECTION test requirements -BuildRequires: %{python_module freezegun >= 0.3.11} -BuildRequires: %{python_module pytest >= 4.3.1} +BuildRequires: %{python_module freezegun} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module python-utils >= 2.3.0} BuildRequires: %{python_module six} # /SECTION %python_subpackages %description -A Python Progressbar library to provide visual (yet text based) -progress to long running operations. +A Python Progressbar library to provide visual (yet text based) progress to long running operations. %prep %setup -q -n progressbar2-%{version} @@ -56,6 +54,9 @@ rm pytest.ini %python_expand %fdupes %{buildroot}%{$python_sitelib} %check +# remove problematic section from pytest.ini +export PYTEST_ADDOPTS="--doctest-modules" +export PYTHONPATH=$PWD %pytest %files %{python_files} From 2b4a4d6957824124f338e57b410dc48f1df30da49cd1d6cc764611c15c561441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 31 Jul 2020 05:52:24 +0000 Subject: [PATCH 2/2] Accepting request 823633 from home:dmacvicar:branches:devel:languages:python - Remove unnecessary python_module devel BuildRequires - Restore conflicts with python-progressbar - Restore BuildArch noarch OBS-URL: https://build.opensuse.org/request/show/823633 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-progressbar2?expand=0&rev=4 --- python-progressbar2.changes | 7 +++++++ python-progressbar2.spec | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/python-progressbar2.changes b/python-progressbar2.changes index de3ebe8..02edf84 100644 --- a/python-progressbar2.changes +++ b/python-progressbar2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jul 30 11:06:51 UTC 2020 - Duncan Mac-Vicar + +- Remove unnecessary python_module devel BuildRequires +- Restore conflicts with python-progressbar +- Restore BuildArch noarch + ------------------------------------------------------------------- Sat Jul 25 09:43:04 UTC 2020 - Duncan Mac-Vicar diff --git a/python-progressbar2.spec b/python-progressbar2.spec index 99670d7..d61aec0 100644 --- a/python-progressbar2.spec +++ b/python-progressbar2.spec @@ -25,12 +25,13 @@ License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/WoLpH/python-progressbar Source: https://files.pythonhosted.org/packages/source/p/progressbar2/progressbar2-%{version}.tar.gz -BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-python-utils >= 2.3.0 Requires: python-six +Conflicts: python-progressbar +BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module freezegun} BuildRequires: %{python_module pytest}