diff options
| -rw-r--r-- | recipes-devtools/python/python3-docker/0001-hotfix-requests-issue.patch | 31 | ||||
| -rw-r--r-- | recipes-devtools/python/python3-docker_5.0.0.bb | 4 |
2 files changed, 35 insertions, 0 deletions
diff --git a/recipes-devtools/python/python3-docker/0001-hotfix-requests-issue.patch b/recipes-devtools/python/python3-docker/0001-hotfix-requests-issue.patch new file mode 100644 index 00000000..70ad8f49 --- /dev/null +++ b/recipes-devtools/python/python3-docker/0001-hotfix-requests-issue.patch | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | From 2efec099ad80c18136dc38d9dafd1bb868bf4c90 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Felix Fontein <felix@fontein.de> | ||
| 3 | Date: Mon, 20 May 2024 21:08:25 +0200 | ||
| 4 | Subject: [PATCH] Add hotfix for requests 2.32.0. (#861) | ||
| 5 | |||
| 6 | Upstream-Status: Backport | ||
| 7 | [https://github.com/ansible-collections/community.docker/commit/ab8b6662c28a2c7b0473d43fcf0b26adb2877ede] | ||
| 8 | |||
| 9 | Signed-off-by: Libo Chen <libo.chen.cn@windriver.com> | ||
| 10 | --- | ||
| 11 | docker/transport/basehttpadapter.py | 7 +++++++ | ||
| 12 | 1 file changed, 7 insertions(+) | ||
| 13 | |||
| 14 | diff --git a/docker/transport/basehttpadapter.py b/docker/transport/basehttpadapter.py | ||
| 15 | index 4d819b6..3ffe78b 100644 | ||
| 16 | --- a/docker/transport/basehttpadapter.py | ||
| 17 | +++ b/docker/transport/basehttpadapter.py | ||
| 18 | @@ -6,3 +6,10 @@ class BaseHTTPAdapter(requests.adapters.HTTPAdapter): | ||
| 19 | super(BaseHTTPAdapter, self).close() | ||
| 20 | if hasattr(self, 'pools'): | ||
| 21 | self.pools.clear() | ||
| 22 | + | ||
| 23 | + # Hotfix for requests 2.32.0: its commit | ||
| 24 | + # https://github.com/psf/requests/commit/c0813a2d910ea6b4f8438b91d315b8d181302356 | ||
| 25 | + # changes requests.adapters.HTTPAdapter to no longer call get_connection() from | ||
| 26 | + # send(), but instead call _get_connection(). | ||
| 27 | + def _get_connection(self, request, *args, **kwargs): | ||
| 28 | + return self.get_connection(request.url, kwargs.get('proxies')) | ||
| 29 | -- | ||
| 30 | 2.35.5 | ||
| 31 | |||
diff --git a/recipes-devtools/python/python3-docker_5.0.0.bb b/recipes-devtools/python/python3-docker_5.0.0.bb index 44d65b05..3ad359c3 100644 --- a/recipes-devtools/python/python3-docker_5.0.0.bb +++ b/recipes-devtools/python/python3-docker_5.0.0.bb | |||
| @@ -3,6 +3,10 @@ HOMEPAGE = "https://github.com/docker/docker-py" | |||
| 3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=34f3846f940453127309b920eeb89660" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=34f3846f940453127309b920eeb89660" |
| 5 | 5 | ||
| 6 | SRC_URI:append = " \ | ||
| 7 | file://0001-hotfix-requests-issue.patch \ | ||
| 8 | " | ||
| 9 | |||
| 6 | SRC_URI[md5sum] = "9cc5156a2ff6458a8f52114b9bbc0d7e" | 10 | SRC_URI[md5sum] = "9cc5156a2ff6458a8f52114b9bbc0d7e" |
| 7 | SRC_URI[sha256sum] = "3e8bc47534e0ca9331d72c32f2881bb13b93ded0bcdeab3c833fb7cf61c0a9a5" | 11 | SRC_URI[sha256sum] = "3e8bc47534e0ca9331d72c32f2881bb13b93ded0bcdeab3c833fb7cf61c0a9a5" |
| 8 | 12 | ||
