Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-docker for openSUSE:Factory checked in at 2024-05-23 15:35:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-docker (Old) and /work/SRC/openSUSE:Factory/.python-docker.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-docker" Thu May 23 15:35:52 2024 rev:28 rq:1176178 version:7.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-docker/python-docker.changes 2023-12-28 23:02:43.037192035 +0100 +++ /work/SRC/openSUSE:Factory/.python-docker.new.24587/python-docker.changes 2024-05-23 15:36:29.726304866 +0200 @@ -1,0 +2,7 @@ +Thu May 23 08:58:30 UTC 2024 - Johannes Kastl <opensuse_buildserv...@ojkastl.de> + +- backport patches to fix errors with requests 2.32.x: + * 2a059a9f19c7b37c6c71c233754c6845e325d1ec.patch + * e33e0a437ecd895158c8cb4322a0cdad79312636.patch + +------------------------------------------------------------------- New: ---- 2a059a9f19c7b37c6c71c233754c6845e325d1ec.patch e33e0a437ecd895158c8cb4322a0cdad79312636.patch BETA DEBUG BEGIN: New:- backport patches to fix errors with requests 2.32.x: * 2a059a9f19c7b37c6c71c233754c6845e325d1ec.patch * e33e0a437ecd895158c8cb4322a0cdad79312636.patch New: * 2a059a9f19c7b37c6c71c233754c6845e325d1ec.patch * e33e0a437ecd895158c8cb4322a0cdad79312636.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-docker.spec ++++++ --- /var/tmp/diff_new_pack.nM7ROf/_old 2024-05-23 15:36:30.166320832 +0200 +++ /var/tmp/diff_new_pack.nM7ROf/_new 2024-05-23 15:36:30.166320832 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-docker # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,12 @@ License: Apache-2.0 URL: https://github.com/docker/docker-py Source: https://files.pythonhosted.org/packages/source/d/docker/docker-%{version}.tar.gz +# PATCH-FIX-UPSTREAM e33e0a437ecd895158c8cb4322a0cdad79312636.patch -- based on commit e33e0a4 +# https://github.com/docker/docker-py/commit/e33e0a437ecd895158c8cb4322a0cdad79312636.patch +Patch1: e33e0a437ecd895158c8cb4322a0cdad79312636.patch +# PATCH-FIX-UPSTREAM 2a059a9f19c7b37c6c71c233754c6845e325d1ec.patch -- based on commit 2a059a9 +# https://github.com/docker/docker-py/commit/2a059a9f19c7b37c6c71c233754c6845e325d1ec.patch +Patch2: 2a059a9f19c7b37c6c71c233754c6845e325d1ec.patch BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools >= 45} BuildRequires: %{python_module setuptools_scm >= 6.2} ++++++ 2a059a9f19c7b37c6c71c233754c6845e325d1ec.patch ++++++ >From 2a059a9f19c7b37c6c71c233754c6845e325d1ec Mon Sep 17 00:00:00 2001 From: Felix Fontein <fe...@fontein.de> Date: Tue, 21 May 2024 18:44:08 +0200 Subject: [PATCH] Extend fix to requests 2.32.2+. Signed-off-by: Felix Fontein <fe...@fontein.de> --- docker/transport/basehttpadapter.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docker/transport/basehttpadapter.py b/docker/transport/basehttpadapter.py index 281897a27..c5996bb3e 100644 --- a/docker/transport/basehttpadapter.py +++ b/docker/transport/basehttpadapter.py @@ -7,9 +7,14 @@ def close(self): if hasattr(self, 'pools'): self.pools.clear() - # Hotfix for requests 2.32.0: its commit + # Hotfix for requests 2.32.0 and 2.32.1: its commit # https://github.com/psf/requests/commit/c0813a2d910ea6b4f8438b91d315b8d181302356 # changes requests.adapters.HTTPAdapter to no longer call get_connection() from # send(), but instead call _get_connection(). def _get_connection(self, request, *args, proxies=None, **kwargs): return self.get_connection(request.url, proxies) + + # Fix for requests 2.32.2+: + # https://github.com/psf/requests/commit/c98e4d133ef29c46a9b68cd783087218a8075e05 + def get_connection_with_tls_context(self, request, verify, proxies=None, cert=None): + return self.get_connection(request.url, proxies) ++++++ e33e0a437ecd895158c8cb4322a0cdad79312636.patch ++++++ >From e33e0a437ecd895158c8cb4322a0cdad79312636 Mon Sep 17 00:00:00 2001 From: Felix Fontein <fe...@fontein.de> Date: Mon, 20 May 2024 21:13:41 +0200 Subject: [PATCH] Hotfix for requests 2.32.0. Signed-off-by: Felix Fontein <fe...@fontein.de> --- docker/transport/basehttpadapter.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker/transport/basehttpadapter.py b/docker/transport/basehttpadapter.py index dfbb193b9..281897a27 100644 --- a/docker/transport/basehttpadapter.py +++ b/docker/transport/basehttpadapter.py @@ -6,3 +6,10 @@ def close(self): super().close() if hasattr(self, 'pools'): self.pools.clear() + + # Hotfix for requests 2.32.0: its commit + # https://github.com/psf/requests/commit/c0813a2d910ea6b4f8438b91d315b8d181302356 + # changes requests.adapters.HTTPAdapter to no longer call get_connection() from + # send(), but instead call _get_connection(). + def _get_connection(self, request, *args, proxies=None, **kwargs): + return self.get_connection(request.url, proxies)
