Re: [PR PATCH] [Updated] docker-compose, python3-docker, python3-docker-pycreds

[dmarto <dmarto@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 959 bytes --]

There is an updated pull request by dmarto against master on the void-packages repository

https://github.com/dmarto/void-packages docker
https://github.com/void-linux/void-packages/pull/33029

docker-compose, python3-docker, python3-docker-pycreds
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

I have also used it heavily in the past day, due to updating several compose plays.

On top of updating to the newer version, I have also cleaned up the dependencies; for example six has not been required for more than an year (in compose, less in docker), and docker-pycreds, has been merged into docker-py (python3-docker) also for more than an year, as no other packages use it (at least in Void repos), I have also opted to remove it. 



A patch file from https://github.com/void-linux/void-packages/pull/33029.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-docker-33029.patch --]
[-- Type: text/x-diff, Size: 6026 bytes --]

From 9eb231a1828547b8abd521253cafc0d2eee1356c Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 20 Sep 2021 06:49:59 +0300
Subject: [PATCH 1/4] python3-docker: update to 5.0.2

---
 .../patches/disable-TCPSocketStreamTest.patch         | 11 +++++++++++
 srcpkgs/python3-docker/template                       |  8 +++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/python3-docker/patches/disable-TCPSocketStreamTest.patch

diff --git a/srcpkgs/python3-docker/patches/disable-TCPSocketStreamTest.patch b/srcpkgs/python3-docker/patches/disable-TCPSocketStreamTest.patch
new file mode 100644
index 000000000000..b5fbefa1586f
--- /dev/null
+++ b/srcpkgs/python3-docker/patches/disable-TCPSocketStreamTest.patch
@@ -0,0 +1,11 @@
+--- a/tests/unit/api_test.py	2021-09-23 22:16:37.092975533 +0300
++++ b/tests/unit/api_test.py	2021-09-23 22:14:14.918720264 +0300
+@@ -474,7 +474,7 @@
+                 str(i).encode() for i in range(50)
+             ]
+ 
+-
++@pytest.mark.skip(reason="fail with: [Errno -2] Name or service not known")
+ class TCPSocketStreamTest(unittest.TestCase):
+     stdout_data = b'''
+     Now, those children out there, they're jumping through the
diff --git a/srcpkgs/python3-docker/template b/srcpkgs/python3-docker/template
index ef6c581745b0..739e95114ab2 100644
--- a/srcpkgs/python3-docker/template
+++ b/srcpkgs/python3-docker/template
@@ -1,14 +1,16 @@
 # Template file for 'python3-docker'
 pkgname=python3-docker
-version=4.4.4
+version=5.0.2
 revision=1
 wrksrc="docker-${version}"
 build_style=python3-module
+make_check_target="tests/unit" # other tests fail due to needing a running docker daemon
 hostmakedepends="python3-setuptools"
-depends="python3-requests python3-six python3-websocket-client python3-docker-pycreds"
+depends="python3-requests python3-websocket-client python3-paramiko"
+checkdepends="${depends} python3-pytest python3-pytest-timeout python3-pytest-cov"
 short_desc="Python3 library for the Docker Engine API"
 maintainer="Sergi Alvarez <pancake@nopcode.org>"
 license="Apache-2.0"
 homepage="https://github.com/docker/docker-py"
 distfiles="${PYPI_SITE}/d/docker/docker-${version}.tar.gz"
-checksum=d3393c878f575d3a9ca3b94471a3c89a6d960b35feb92f033c0de36cc9d934db
+checksum=21ec4998e90dff7a7aaaa098ca8d839c7de412b89e6f6c30908372d58fecf663

From 4cc14fde257b30a8d5c9f67ff41d9ac5961bddb7 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 20 Sep 2021 06:49:29 +0300
Subject: [PATCH 2/4] docker-compose: update to 1.29.2

---
 srcpkgs/docker-compose/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index e447d00c79f7..ddbef482d17a 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,20 +1,20 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
-version=1.27.4
-revision=3
+version=1.29.2
+revision=1
 wrksrc="compose-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-jsonschema python3-docker>=3.7.0
- python3-dockerpty python3-requests python3-docopt python3-yaml python3-six
- python3-texttable python3-cached-property python3-paramiko>=2.4.2
+depends="python3-setuptools python3-jsonschema python3-docker>=5.0.0
+ python3-dockerpty python3-requests python3-docopt python3-yaml
+ python3-texttable python3-cached-property python3-paramiko
  python3-dotenv python3-distro"
 short_desc="Tool to define and run multi-container Docker applications"
 maintainer="pancake <pancake@nopcode.org>"
 license="Apache-2.0"
 homepage="https://docs.docker.com/compose/"
 distfiles="https://github.com/docker/compose/archive/${version}.tar.gz"
-checksum=1c0458f37e9de4bf2d79fe82c9ab0065c8a6132496c3c2f477599604e294a422
+checksum=99a9b91d476062d280c889ae4e9993d7dd6a186327bafb2bb39521f9351b96eb
 make_check=no # needs ddt which is not packaged
 
 post_install() {

From 1a6ff413773167f515473068c9842051c90d18a5 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 20 Sep 2021 06:59:23 +0300
Subject: [PATCH 3/4] python3-docker-pycreds: remove package

Merged into docker-py (python3-docker in void)
https://github.com/docker/docker-py/commit/a823acc2cae10c4635db2fb963cc37d8a23cc0c4
---
 srcpkgs/python3-docker-pycreds/template | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 srcpkgs/python3-docker-pycreds/template

diff --git a/srcpkgs/python3-docker-pycreds/template b/srcpkgs/python3-docker-pycreds/template
deleted file mode 100644
index 8a790a57bebd..000000000000
--- a/srcpkgs/python3-docker-pycreds/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python3-docker-pycreds'
-pkgname=python3-docker-pycreds
-version=0.4.0
-revision=4
-wrksrc="docker-pycreds-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-six"
-short_desc="Python3 bindings for the docker credentials store API"
-maintainer="Sergi Alvarez <pancake@nopcode.org>"
-license="Apache-2.0"
-homepage="https://github.com/shin-/dockerpy-creds"
-distfiles="${PYPI_SITE}/d/docker-pycreds/docker-pycreds-${version}.tar.gz"
-checksum=6ce3270bcaf404cc4c3e27e4b6c70d3521deae82fb508767870fdbf772d584d4

From 9e1e7b21e6f0fcc4869dd12aa04a820c95615b30 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 20 Sep 2021 07:00:40 +0300
Subject: [PATCH 4/4] removed-packages: add python3-docker-pycreds

---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a159a0bd31e1..4cef0c4f648c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -264,6 +264,7 @@ replaces="
  python3-aiohttp2<=2.3.10_4
  python3-aiohttp-cors2<=0.7.0_3
  python3-idna-ssl<=1.1.0_3
+ python3-docker-pycreds<=0.4.0_4
  qimageblitz<=0.0.6_4
  quake4<=1.4.2_3
  qucs<=0.0.19_2