forked from pool/python-docker
- 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.<network>.Aliases
due to engine changes
- change source url as release tarball doesn't include tests anymore
- drop patches which are now included upstream
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docker?expand=0&rev=58
This commit is contained in:
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
.osc
|
||||
30
2a059a9f19c7b37c6c71c233754c6845e325d1ec.patch
Normal file
30
2a059a9f19c7b37c6c71c233754c6845e325d1ec.patch
Normal file
@@ -0,0 +1,30 @@
|
||||
From 2a059a9f19c7b37c6c71c233754c6845e325d1ec Mon Sep 17 00:00:00 2001
|
||||
From: Felix Fontein <felix@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 <felix@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)
|
||||
BIN
docker-7.0.0.tar.gz
LFS
Normal file
BIN
docker-7.0.0.tar.gz
LFS
Normal file
Binary file not shown.
BIN
docker-7.1.0.tar.gz
LFS
Normal file
BIN
docker-7.1.0.tar.gz
LFS
Normal file
Binary file not shown.
25
e33e0a437ecd895158c8cb4322a0cdad79312636.patch
Normal file
25
e33e0a437ecd895158c8cb4322a0cdad79312636.patch
Normal file
@@ -0,0 +1,25 @@
|
||||
From e33e0a437ecd895158c8cb4322a0cdad79312636 Mon Sep 17 00:00:00 2001
|
||||
From: Felix Fontein <felix@fontein.de>
|
||||
Date: Mon, 20 May 2024 21:13:41 +0200
|
||||
Subject: [PATCH] Hotfix for requests 2.32.0.
|
||||
|
||||
Signed-off-by: Felix Fontein <felix@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)
|
||||
1169
python-docker.changes
Normal file
1169
python-docker.changes
Normal file
File diff suppressed because it is too large
Load Diff
77
python-docker.spec
Normal file
77
python-docker.spec
Normal file
@@ -0,0 +1,77 @@
|
||||
#
|
||||
# spec file for package python-docker
|
||||
#
|
||||
# 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
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%{?sle15_python_module_pythons}
|
||||
Name: python-docker
|
||||
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://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}
|
||||
BuildRequires: %{python_module wheel}
|
||||
BuildRequires: python-rpm-macros
|
||||
# SECTION test requirements
|
||||
BuildRequires: %{python_module packaging >= 14.0}
|
||||
BuildRequires: %{python_module paramiko >= 2.11.0}
|
||||
BuildRequires: %{python_module pytest >= 7.1.2}
|
||||
BuildRequires: %{python_module pytest-timeout >= 2.1.0}
|
||||
BuildRequires: %{python_module requests >= 2.26.0}
|
||||
BuildRequires: %{python_module setuptools >= 65.5.1}
|
||||
BuildRequires: %{python_module urllib3 >= 2.0}
|
||||
BuildRequires: %{python_module websocket-client >= 0.32.0}
|
||||
# /SECTION
|
||||
BuildRequires: fdupes
|
||||
Requires: python-packaging >= 14.0
|
||||
Requires: python-requests >= 2.26.0
|
||||
Requires: python-urllib3 >= 1.26.0
|
||||
Requires: python-websocket-client >= 0.32.0
|
||||
Suggests: python-pywin32 >= 304
|
||||
Suggests: python-paramiko >= 2.4.3
|
||||
BuildArch: noarch
|
||||
%python_subpackages
|
||||
|
||||
%description
|
||||
A Python library for the Docker Engine API.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n docker-py-%{version}
|
||||
|
||||
%build
|
||||
export SETUPTOOLS_SCM_PRETEND_VERSION=%{version}
|
||||
%pyproject_wheel
|
||||
|
||||
%install
|
||||
%pyproject_install
|
||||
%python_expand %fdupes %{buildroot}%{$python_sitelib}
|
||||
|
||||
%check
|
||||
%pytest tests/unit
|
||||
|
||||
%files %{python_files}
|
||||
%doc README.md
|
||||
%license LICENSE
|
||||
%{python_sitelib}/docker
|
||||
%{python_sitelib}/docker-%{version}.dist-info
|
||||
|
||||
%changelog
|
||||
Reference in New Issue
Block a user