From 9ba2599ee20c4d5fcc289fda3c42f71a9d09429deb3664a6f235c9d83853234d Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 2 Aug 2022 08:22:03 +0000 Subject: [PATCH 1/3] Accepting request 992107 from home:deneb_alpha:branches:devel:languages:python - Enhanced dependency management for Py3.7 and earlier * Re-add `responses` that is needed for building tests - Use python_module macro for build requires - Remove the BuildRequires: %{python_module devel} - Refactoring of spec file with spec-cleaner OBS-URL: https://build.opensuse.org/request/show/992107 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-osc-tiny?expand=0&rev=45 --- python-osc-tiny.changes | 9 +++++++++ python-osc-tiny.spec | 25 ++++++++++++------------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/python-osc-tiny.changes b/python-osc-tiny.changes index 6e39482..f1652b2 100644 --- a/python-osc-tiny.changes +++ b/python-osc-tiny.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Aug 1 21:35:10 UTC 2022 - Marina Latini + +- Enhanced dependency management for Py3.7 and earlier + * Re-add `responses` that is needed for building tests +- Use python_module macro for build requires +- Remove the BuildRequires: %{python_module devel} +- Refactoring of spec file with spec-cleaner + ------------------------------------------------------------------- Thu Jul 21 14:15:00 UTC 2022 - Andreas Hasenkopf diff --git a/python-osc-tiny.spec b/python-osc-tiny.spec index 9dad989..7006336 100644 --- a/python-osc-tiny.spec +++ b/python-osc-tiny.spec @@ -27,27 +27,26 @@ Group: Development/Languages/Python URL: https://github.com/crazyscientist/osc-tiny Source: https://files.pythonhosted.org/packages/source/o/osc-tiny/osc-tiny-%{version}.tar.gz BuildRequires: %{python_module PyYAML} -BuildRequires: %{python_module devel} BuildRequires: %{python_module lxml} BuildRequires: %{python_module pytest} BuildRequires: %{python_module python-dateutil} BuildRequires: %{python_module pytz} BuildRequires: %{python_module requests} -BuildRequires: %{python_module responses} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-PyYAML Requires: python-lxml +Requires: python-pyYAML Requires: python-python-dateutil Requires: python-pytz Requires: python-requests -%if %python_version_nodots < 38 -BuildRequires: python3-cached-property -Requires: python-cached-property -%endif Suggests: openssh BuildArch: noarch +%if 0%{?python_version_nodots} < 38 +BuildRequires: %{python_module cached-property} +BuildRequires: %{python_module responses} +Requires: python-cached-property +%endif %python_subpackages %description @@ -56,9 +55,9 @@ accessing the OpenBuildService API. For further details see: -* https://osc-tiny.readthedocs.io/en/latest/ -* https://openbuildservice.org/ -* https://build.opensuse.org/apidocs/index + * https://osc-tiny.readthedocs.io/en/latest/ + * https://openbuildservice.org/ + * https://build.opensuse.org/apidocs/index %prep %setup -q -n osc-tiny-%{version} @@ -66,13 +65,13 @@ For further details see: %build %python_build -%check -%pytest - %install %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +%check +%pytest + %files %{python_files} %doc README.md %license LICENSE From 38f75bca2e808d04dfdf5f08c8491e5d98da68f009c3728189e488e23dfb95bb Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 2 Aug 2022 08:23:11 +0000 Subject: [PATCH 2/3] - Fix two typos OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-osc-tiny?expand=0&rev=46 --- python-osc-tiny.changes | 5 +++++ python-osc-tiny.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/python-osc-tiny.changes b/python-osc-tiny.changes index f1652b2..693511e 100644 --- a/python-osc-tiny.changes +++ b/python-osc-tiny.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 2 08:23:02 UTC 2022 - Matej Cepl + +- Fix two typos + ------------------------------------------------------------------- Mon Aug 1 21:35:10 UTC 2022 - Marina Latini diff --git a/python-osc-tiny.spec b/python-osc-tiny.spec index 7006336..bbddea4 100644 --- a/python-osc-tiny.spec +++ b/python-osc-tiny.spec @@ -32,6 +32,7 @@ BuildRequires: %{python_module pytest} BuildRequires: %{python_module python-dateutil} BuildRequires: %{python_module pytz} BuildRequires: %{python_module requests} +BuildRequires: %{python_module responses} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -42,9 +43,8 @@ Requires: python-pytz Requires: python-requests Suggests: openssh BuildArch: noarch -%if 0%{?python_version_nodots} < 38 +%if %python_version_nodots < 38 BuildRequires: %{python_module cached-property} -BuildRequires: %{python_module responses} Requires: python-cached-property %endif %python_subpackages From 995b5400a1ccd5f18d63826e161e41583709b2da7767b2076813cb8d0ffcee35 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 2 Aug 2022 15:45:54 +0000 Subject: [PATCH 3/3] - It's PyYAML, not pyYAML. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-osc-tiny?expand=0&rev=47 --- python-osc-tiny.changes | 5 +++++ python-osc-tiny.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-osc-tiny.changes b/python-osc-tiny.changes index 693511e..2fce88f 100644 --- a/python-osc-tiny.changes +++ b/python-osc-tiny.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 2 15:45:47 UTC 2022 - Matej Cepl + +- It's PyYAML, not pyYAML. + ------------------------------------------------------------------- Tue Aug 2 08:23:02 UTC 2022 - Matej Cepl diff --git a/python-osc-tiny.spec b/python-osc-tiny.spec index bbddea4..e0d0a53 100644 --- a/python-osc-tiny.spec +++ b/python-osc-tiny.spec @@ -36,8 +36,8 @@ BuildRequires: %{python_module responses} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros +Requires: python-PyYAML Requires: python-lxml -Requires: python-pyYAML Requires: python-python-dateutil Requires: python-pytz Requires: python-requests