From a774b4c6a1c5c3e882f2af60c5c275b429562ae175df991eeb194fdc055f26ea Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 21 Nov 2023 16:53:22 +0000 Subject: [PATCH 1/2] Accepting request 1127939 from home:mcalabkova:branches:devel:languages:python - Require old urllib3 * Cookie headers are stripped since urllib3 2.0.6, which breaks Firewall OBS-URL: https://build.opensuse.org/request/show/1127939 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-digitalocean?expand=0&rev=10 --- python-digitalocean.changes | 6 ++++++ python-digitalocean.spec | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/python-digitalocean.changes b/python-digitalocean.changes index a0507d2..02fba02 100644 --- a/python-digitalocean.changes +++ b/python-digitalocean.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 21 15:07:55 UTC 2023 - Markéta Machová + +- Require old urllib3 + * Cookie headers are stripped since urllib3 2.0.6, which breaks Firewall + ------------------------------------------------------------------- Sun Jul 2 12:24:05 UTC 2023 - ecsos diff --git a/python-digitalocean.spec b/python-digitalocean.spec index 8990b7b..afe21c8 100644 --- a/python-digitalocean.spec +++ b/python-digitalocean.spec @@ -1,7 +1,7 @@ # # spec file for package python-digitalocean # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,6 +30,7 @@ BuildRequires: %{python_module pytest} BuildRequires: %{python_module requests >= 2.2.1} BuildRequires: %{python_module responses} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module urllib3 < 2.0.6} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: unzip @@ -37,6 +38,8 @@ Requires: python-jsonpickle Requires: python-pytest Requires: python-requests >= 2.2.1 Requires: python-responses +# urllib3 2.0.6 strips Cookies header, which changes the behavior of requests, which in turn breaks the Firewall tests +Requires: python-urllib3 < 2.0.6 BuildArch: noarch %python_subpackages @@ -44,7 +47,7 @@ BuildArch: noarch Python module to manage Digital Ocean droplets. %prep -%setup -q -n python-digitalocean-%{version} +%autosetup -p1 -n python-digitalocean-%{version} %build export LANG=en_US.UTF-8 From 867aa105bc3332d3fb7a98c58d1ab56db5af7d9e2b88e29de22471b5734cd636 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 21 Nov 2023 16:58:56 +0000 Subject: [PATCH 2/2] - Clean up the SPEC file OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-digitalocean?expand=0&rev=11 --- python-digitalocean.changes | 5 +++++ python-digitalocean.spec | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/python-digitalocean.changes b/python-digitalocean.changes index 02fba02..565c739 100644 --- a/python-digitalocean.changes +++ b/python-digitalocean.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 21 16:58:50 UTC 2023 - Matej Cepl + +- Clean up the SPEC file + ------------------------------------------------------------------- Tue Nov 21 15:07:55 UTC 2023 - Markéta Machová diff --git a/python-digitalocean.spec b/python-digitalocean.spec index afe21c8..0f6d0a1 100644 --- a/python-digitalocean.spec +++ b/python-digitalocean.spec @@ -26,11 +26,13 @@ Group: Development/Languages/Python URL: https://github.com/koalalorenzo/python-digitalocean/ Source: https://github.com/koalalorenzo/python-digitalocean/archive/v%{version}.tar.gz BuildRequires: %{python_module jsonpickle} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: %{python_module requests >= 2.2.1} BuildRequires: %{python_module responses} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module urllib3 < 2.0.6} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: unzip @@ -51,11 +53,11 @@ Python module to manage Digital Ocean droplets. %build export LANG=en_US.UTF-8 -%python_build +%pyproject_wheel %install export LANG=en_US.UTF-8 -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -65,6 +67,7 @@ export LANG=en_US.UTF-8 %files %{python_files} %doc README.md %license LICENSE.txt -%{python_sitelib}/* +%{python_sitelib}/digitalocean +%{python_sitelib}/python_digitalocean-%{version}*-info %changelog