diff --git a/2a059a9f19c7b37c6c71c233754c6845e325d1ec.patch b/2a059a9f19c7b37c6c71c233754c6845e325d1ec.patch deleted file mode 100644 index 035b28a..0000000 --- a/2a059a9f19c7b37c6c71c233754c6845e325d1ec.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2a059a9f19c7b37c6c71c233754c6845e325d1ec Mon Sep 17 00:00:00 2001 -From: Felix Fontein -Date: Tue, 21 May 2024 18:44:08 +0200 -Subject: [PATCH] Extend fix to requests 2.32.2+. - -Signed-off-by: Felix Fontein ---- - 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) diff --git a/docker-7.0.0.tar.gz b/docker-7.0.0.tar.gz deleted file mode 100644 index 57de0d4..0000000 --- a/docker-7.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:323736fb92cd9418fc5e7133bc953e11a9da04f4483f828b527db553f1e7e5a3 -size 258536 diff --git a/docker-7.1.0.tar.gz b/docker-7.1.0.tar.gz new file mode 100644 index 0000000..f130556 --- /dev/null +++ b/docker-7.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88d2b4271ded68be2abc7db35ceed342ef81804a58c8f4f32fa34f7fdef5f662 +size 253282 diff --git a/e33e0a437ecd895158c8cb4322a0cdad79312636.patch b/e33e0a437ecd895158c8cb4322a0cdad79312636.patch deleted file mode 100644 index cc32449..0000000 --- a/e33e0a437ecd895158c8cb4322a0cdad79312636.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e33e0a437ecd895158c8cb4322a0cdad79312636 Mon Sep 17 00:00:00 2001 -From: Felix Fontein -Date: Mon, 20 May 2024 21:13:41 +0200 -Subject: [PATCH] Hotfix for requests 2.32.0. - -Signed-off-by: Felix Fontein ---- - 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) diff --git a/python-docker.changes b/python-docker.changes index bdfccf7..63afdba 100644 --- a/python-docker.changes +++ b/python-docker.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Fri Aug 23 08:13:32 UTC 2024 - Nico Krapp + +- Update to 7.1.0 + * Bumped minimum engine API version to 1.24 + * Bumped default engine API version to 1.44 (Moby 25.0) + * Fixed issue with lang parsing when the registry address + includes ports taht resulted in `invalid tag format` errors + * Fixed issue preventing creating new configs (ConfigCollection), + which failed with a KeyError due to the name field + * Fixed an issue due to an update in the requests package breaking + docker-py by applying the suggested fix + * Documentation improvements + * Updated Ruff (linter) and fixed minor linting issues + * Started using hatch for packaging + * Stopped checking for deprecated container and image related + fields (Container and ContainerConfig) + * Updated tests that check NetworkSettings.Networks..Aliases + due to engine changes +- change source url as release tarball doesn't include tests anymore +- drop patches which are now included upstream + ------------------------------------------------------------------- Thu May 23 08:58:30 UTC 2024 - Johannes Kastl diff --git a/python-docker.spec b/python-docker.spec index 993bc92..9dde261 100644 --- a/python-docker.spec +++ b/python-docker.spec @@ -18,18 +18,14 @@ %{?sle15_python_module_pythons} Name: python-docker -Version: 7.0.0 +Version: 7.1.0 Release: 0 Summary: A Python library for the Docker Engine API 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 +Source: https://github.com/docker/docker-py/archive/refs/tags/%{version}.tar.gz#/docker-%{version}.tar.gz +BuildRequires: %{python_module hatch_vcs} +BuildRequires: %{python_module hatchling} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools >= 45} BuildRequires: %{python_module setuptools_scm >= 6.2} @@ -59,9 +55,10 @@ BuildArch: noarch A Python library for the Docker Engine API. %prep -%autosetup -p1 -n docker-%{version} +%autosetup -p1 -n docker-py-%{version} %build +export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} %pyproject_wheel %install