* [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds
@ 2021-09-20 4:10 dmarto
2021-09-20 5:10 ` [PR PATCH] [Updated] " dmarto
` (17 more replies)
0 siblings, 18 replies; 19+ messages in thread
From: dmarto @ 2021-09-20 4:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1003 bytes --]
There is a new 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 generally don't use the affected packages but briefly tested this PR
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, 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: 4836 bytes --]
From 95bae35bec9088557da7610c7078d88dbee8e2e1 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 20 Sep 2021 06:49:29 +0300
Subject: [PATCH 1/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..e2910e04f864 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
+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>=2.4.2
- python3-dotenv python3-distro"
+ python3-dotenv python3-distro python3-websocket-client"
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 734f8f3b76bd493bce5625a4694a6cd33a563d45 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 20 Sep 2021 06:49:59 +0300
Subject: [PATCH 2/4] python3-docker: update to 5.0.2
---
srcpkgs/python3-docker/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-docker/template b/srcpkgs/python3-docker/template
index ef6c581745b0..fb2e584cf441 100644
--- a/srcpkgs/python3-docker/template
+++ b/srcpkgs/python3-docker/template
@@ -1,14 +1,14 @@
# 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
hostmakedepends="python3-setuptools"
-depends="python3-requests python3-six python3-websocket-client python3-docker-pycreds"
+depends="python3-requests python3-websocket-client python3-paramiko>=2.4.2"
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 e13af58602eabdb25ac05990f6043b67b9b2f031 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 python3-docker, around 2019
---
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 03a131777bad42c9baed7540dd585b055f307201 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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] docker-compose, python3-docker, python3-docker-pycreds
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
@ 2021-09-20 5:10 ` dmarto
2021-09-20 5:11 ` dmarto
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dmarto @ 2021-09-20 5:10 UTC (permalink / raw)
To: ml
[-- 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: 4929 bytes --]
From ae3fb33ccfd75e6940465d86aa0cc4f5c03d2285 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 20 Sep 2021 06:49:29 +0300
Subject: [PATCH 1/4] docker-compose: update to 1.29.2
---
srcpkgs/docker-compose/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index e447d00c79f7..9d1d2ef486e6 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,12 +1,12 @@
# 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
+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>=2.4.2
python3-dotenv python3-distro"
short_desc="Tool to define and run multi-container Docker applications"
@@ -14,7 +14,7 @@ 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 3fc12c2c567da5e76bc64eddb20f3dab432bd28d Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 20 Sep 2021 06:49:59 +0300
Subject: [PATCH 2/4] python3-docker: update to 5.0.2
---
srcpkgs/python3-docker/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-docker/template b/srcpkgs/python3-docker/template
index ef6c581745b0..cac49099d6a5 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
hostmakedepends="python3-setuptools"
-depends="python3-requests python3-six python3-websocket-client python3-docker-pycreds"
+depends="python3-requests python3-websocket-client python3-paramiko>=2.4.2"
+checkdepends="${depends} tox python3-pytest python3-pytest-timeout
+ python3-pytest-cov python3-pytest-mock flake8 python3-coverage"
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 1ac5049951eea852925962422a159fc3c1927157 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 python3-docker, around 2019
---
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 a1a14c9dd8b9a7574d1e9e5881d5ea402810ac8e 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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: docker-compose, python3-docker, python3-docker-pycreds
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
2021-09-20 5:10 ` [PR PATCH] [Updated] " dmarto
@ 2021-09-20 5:11 ` dmarto
2021-09-20 5:12 ` dmarto
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dmarto @ 2021-09-20 5:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 761 bytes --]
New comment by dmarto on void-packages repository
https://github.com/void-linux/void-packages/pull/33029#issuecomment-922641928
Comment:
I am at a lost at how to make the tests run for (python3-docker), they seem to require a running docker? They fail as if they are expecting a running docker daemon.
```
...
ERROR tests/integration/client_test.py - docker.errors.DockerException: Error...
E docker.errors.DockerException: Error while fetching server API version: ('Connection aborted.', FileNotFoundError(2, 'No such file or directory'))
...
```
Also, I noticed https://github.com/void-linux/void-packages/commit/6747df239d53e79cf2e5fbb50b4cf9bf80567585 which, I must have missed earlier, so will force push an update that honors the removal.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: docker-compose, python3-docker, python3-docker-pycreds
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
2021-09-20 5:10 ` [PR PATCH] [Updated] " dmarto
2021-09-20 5:11 ` dmarto
@ 2021-09-20 5:12 ` dmarto
2021-09-20 5:17 ` dmarto
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dmarto @ 2021-09-20 5:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 754 bytes --]
New comment by dmarto on void-packages repository
https://github.com/void-linux/void-packages/pull/33029#issuecomment-922641928
Comment:
I am at a lost to make the tests run (for python3-docker), they seem to require a running docker? They fail as if they are expecting a running docker daemon.
```
...
ERROR tests/integration/client_test.py - docker.errors.DockerException: Error...
E docker.errors.DockerException: Error while fetching server API version: ('Connection aborted.', FileNotFoundError(2, 'No such file or directory'))
...
```
Also, I noticed https://github.com/void-linux/void-packages/commit/6747df239d53e79cf2e5fbb50b4cf9bf80567585 which, I must have missed earlier, so will force push an update that honors the removal.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: docker-compose, python3-docker, python3-docker-pycreds
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
` (2 preceding siblings ...)
2021-09-20 5:12 ` dmarto
@ 2021-09-20 5:17 ` dmarto
2021-09-20 5:18 ` dmarto
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dmarto @ 2021-09-20 5:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 876 bytes --]
New comment by dmarto on void-packages repository
https://github.com/void-linux/void-packages/pull/33029#issuecomment-922641928
Comment:
I am at a lost to make the tests run (for python3-docker), they seem to require a running docker? They fail as if they are expecting a running docker daemon.
```
...
ERROR tests/integration/client_test.py - docker.errors.DockerException: Error...
E docker.errors.DockerException: Error while fetching server API version: ('Connection aborted.', FileNotFoundError(2, 'No such file or directory'))
...
```
Also, I noticed https://github.com/void-linux/void-packages/commit/6747df239d53e79cf2e5fbb50b4cf9bf80567585 which, I must have missed earlier, so will force push an update that honors the removal.
EDIT: Huh, the test are running in the github ci, I guess they are intended to be used inside a docker container only?
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: docker-compose, python3-docker, python3-docker-pycreds
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
` (3 preceding siblings ...)
2021-09-20 5:17 ` dmarto
@ 2021-09-20 5:18 ` dmarto
2021-09-20 5:19 ` dmarto
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dmarto @ 2021-09-20 5:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 883 bytes --]
New comment by dmarto on void-packages repository
https://github.com/void-linux/void-packages/pull/33029#issuecomment-922641928
Comment:
I am at a lost at how to make the tests run (for python3-docker), they seem to require a running docker? They fail as if they are expecting a running docker daemon.
```
...
ERROR tests/integration/client_test.py - docker.errors.DockerException: Error...
E docker.errors.DockerException: Error while fetching server API version: ('Connection aborted.', FileNotFoundError(2, 'No such file or directory'))
...
```
Also, I noticed https://github.com/void-linux/void-packages/commit/6747df239d53e79cf2e5fbb50b4cf9bf80567585 which, I must have missed earlier, so will force push an update that honors the removal.
EDIT: Huh, the test are running in the github ci, I guess they are intended to be used inside a docker container only?
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: docker-compose, python3-docker, python3-docker-pycreds
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
` (4 preceding siblings ...)
2021-09-20 5:18 ` dmarto
@ 2021-09-20 5:19 ` dmarto
2021-09-20 5:24 ` [PR PATCH] [Updated] " dmarto
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dmarto @ 2021-09-20 5:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 880 bytes --]
New comment by dmarto on void-packages repository
https://github.com/void-linux/void-packages/pull/33029#issuecomment-922641928
Comment:
I am at a lost how to make the tests run (for python3-docker), they seem to require a running docker? They fail as if they are expecting a running docker daemon.
```
...
ERROR tests/integration/client_test.py - docker.errors.DockerException: Error...
E docker.errors.DockerException: Error while fetching server API version: ('Connection aborted.', FileNotFoundError(2, 'No such file or directory'))
...
```
Also, I noticed https://github.com/void-linux/void-packages/commit/6747df239d53e79cf2e5fbb50b4cf9bf80567585 which, I must have missed earlier, so will force push an update that honors the removal.
EDIT: Huh, the test are running in the github ci, I guess they are intended to be used inside a docker container only?
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] docker-compose, python3-docker, python3-docker-pycreds
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
` (5 preceding siblings ...)
2021-09-20 5:19 ` dmarto
@ 2021-09-20 5:24 ` dmarto
2021-09-20 5:27 ` dmarto
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dmarto @ 2021-09-20 5:24 UTC (permalink / raw)
To: ml
[-- 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: 5001 bytes --]
From ae3fb33ccfd75e6940465d86aa0cc4f5c03d2285 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 20 Sep 2021 06:49:29 +0300
Subject: [PATCH 1/4] docker-compose: update to 1.29.2
---
srcpkgs/docker-compose/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index e447d00c79f7..9d1d2ef486e6 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,12 +1,12 @@
# 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
+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>=2.4.2
python3-dotenv python3-distro"
short_desc="Tool to define and run multi-container Docker applications"
@@ -14,7 +14,7 @@ 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 99ebabf9ae3c6857861569254caf07cb1985af3b Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 20 Sep 2021 06:49:59 +0300
Subject: [PATCH 2/4] python3-docker: update to 5.0.2
---
srcpkgs/python3-docker/template | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-docker/template b/srcpkgs/python3-docker/template
index ef6c581745b0..9c18b9f02409 100644
--- a/srcpkgs/python3-docker/template
+++ b/srcpkgs/python3-docker/template
@@ -1,14 +1,17 @@
# 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
hostmakedepends="python3-setuptools"
-depends="python3-requests python3-six python3-websocket-client python3-docker-pycreds"
+depends="python3-requests python3-websocket-client python3-paramiko>=2.4.2"
+checkdepends="${depends} tox python3-pytest python3-pytest-timeout
+ python3-pytest-cov python3-pytest-mock flake8 python3-coverage"
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
+make_check=no # needs a running docker and credential store pass data
From 711436ea7d55645156068b393854377ae07f98b8 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 python3-docker, around 2019
---
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 e0432bd38b4f73bfda85574d9ce701b6c92ee40d 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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: docker-compose, python3-docker, python3-docker-pycreds
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
` (6 preceding siblings ...)
2021-09-20 5:24 ` [PR PATCH] [Updated] " dmarto
@ 2021-09-20 5:27 ` dmarto
2021-09-20 18:19 ` dmarto
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dmarto @ 2021-09-20 5:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
New comment by dmarto on void-packages repository
https://github.com/void-linux/void-packages/pull/33029#issuecomment-922646620
Comment:
OKey, no, no tests, bad docker :D
https://github.com/docker/docker-py/blob/master/tests/Dockerfile, I was kinda right, you need to run the tests inside docker and I don't even wanna dig into all the credential store pass data stuff, so I am suggesting `make_check=no`
Waiting/open for suggestion/comment/criticism from anyone, but mainly the void maintainers.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: docker-compose, python3-docker, python3-docker-pycreds
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
` (7 preceding siblings ...)
2021-09-20 5:27 ` dmarto
@ 2021-09-20 18:19 ` dmarto
2021-09-21 22:11 ` paper42
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dmarto @ 2021-09-20 18:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 504 bytes --]
New comment by dmarto on void-packages repository
https://github.com/void-linux/void-packages/pull/33029#issuecomment-922646620
Comment:
OKey, no tests, bad docker :D
https://github.com/docker/docker-py/blob/master/tests/Dockerfile, I was kinda right, you need to run the tests inside docker and I don't even wanna dig into all the credential store pass data stuff, so I am suggesting `make_check=no`
Waiting/open for suggestion/comment/criticism from anyone, but mainly the void maintainers.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: docker-compose, python3-docker, python3-docker-pycreds
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
` (8 preceding siblings ...)
2021-09-20 18:19 ` dmarto
@ 2021-09-21 22:11 ` paper42
2021-09-22 5:51 ` dmarto
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: paper42 @ 2021-09-21 22:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 613 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/33029#issuecomment-924425632
Comment:
> [https://github.com/docker/docker-py/blob/master/tests/Dockerfile](https://github.com/docker/docker-py/blob/master/tests/Dockerfile?rgh-link-date=2021-09-20T05%3A27%3A25Z), I was kinda right, you need to run the tests inside docker and I don't even wanna dig into all the credential store pass data stuff, so I am suggesting `make_check=no`
Does this apply to all tests or just some of them? We could disable the ones that don't work as expected in some environments.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: docker-compose, python3-docker, python3-docker-pycreds
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
` (9 preceding siblings ...)
2021-09-21 22:11 ` paper42
@ 2021-09-22 5:51 ` dmarto
2021-09-23 19:49 ` [PR PATCH] [Updated] " dmarto
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dmarto @ 2021-09-22 5:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
New comment by dmarto on void-packages repository
https://github.com/void-linux/void-packages/pull/33029#issuecomment-924607305
Comment:
@paper42 okey, I guess that is fair, let me play a bit and will push an update later today
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] docker-compose, python3-docker, python3-docker-pycreds
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
` (10 preceding siblings ...)
2021-09-22 5:51 ` dmarto
@ 2021-09-23 19:49 ` dmarto
2021-09-23 20:02 ` dmarto
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dmarto @ 2021-09-23 19:49 UTC (permalink / raw)
To: ml
[-- 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: 5987 bytes --]
From 034fa3e32816b7a1a77df5751f3b3f8f6a94ecb5 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..757d95898dbc 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>=2.4.2"
+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 c12be62681c6ca2bc034bc7aa06a100cffdaa024 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 | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index e447d00c79f7..9d1d2ef486e6 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,12 +1,12 @@
# 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
+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>=2.4.2
python3-dotenv python3-distro"
short_desc="Tool to define and run multi-container Docker applications"
@@ -14,7 +14,7 @@ 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 1d4cd2368f2626313473a51ac750f7ebf8ebbcf1 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 27ba6a1a9bf0706d7f9749ea7783d0387c287add 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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: docker-compose, python3-docker, python3-docker-pycreds
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
` (11 preceding siblings ...)
2021-09-23 19:49 ` [PR PATCH] [Updated] " dmarto
@ 2021-09-23 20:02 ` dmarto
2021-09-24 8:31 ` [PR REVIEW] " paper42
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dmarto @ 2021-09-23 20:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 486 bytes --]
New comment by dmarto on void-packages repository
https://github.com/void-linux/void-packages/pull/33029#issuecomment-926113754
Comment:
@paper42 I have narrowed it down, now it is running all unit tests (sans eight tests, that fail); the other test integration and ssh, require a running docker daemon, so we just ignore them by setting `make_check_target` to `tests/unit`.
I have also updated the commit msg. for the removal of docker-pycreds, with a link to where it happened.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] docker-compose, python3-docker, python3-docker-pycreds
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
` (12 preceding siblings ...)
2021-09-23 20:02 ` dmarto
@ 2021-09-24 8:31 ` paper42
2021-09-24 8:31 ` paper42
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: paper42 @ 2021-09-24 8:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/33029#discussion_r715420973
Comment:
we have had `python3-paramiko>=2.4.2` since 2018, so we can drop this version restriction
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] docker-compose, python3-docker, python3-docker-pycreds
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
` (13 preceding siblings ...)
2021-09-24 8:31 ` [PR REVIEW] " paper42
@ 2021-09-24 8:31 ` paper42
2021-09-24 14:54 ` [PR PATCH] [Updated] " dmarto
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: paper42 @ 2021-09-24 8:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/33029#discussion_r715421200
Comment:
same here
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] docker-compose, python3-docker, python3-docker-pycreds
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
` (14 preceding siblings ...)
2021-09-24 8:31 ` paper42
@ 2021-09-24 14:54 ` dmarto
2021-09-24 14:54 ` [PR REVIEW] " dmarto
2021-09-26 12:49 ` [PR PATCH] [Merged]: " paper42
17 siblings, 0 replies; 19+ messages in thread
From: dmarto @ 2021-09-24 14:54 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] docker-compose, python3-docker, python3-docker-pycreds
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
` (15 preceding siblings ...)
2021-09-24 14:54 ` [PR PATCH] [Updated] " dmarto
@ 2021-09-24 14:54 ` dmarto
2021-09-26 12:49 ` [PR PATCH] [Merged]: " paper42
17 siblings, 0 replies; 19+ messages in thread
From: dmarto @ 2021-09-24 14:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 150 bytes --]
New review comment by dmarto on void-packages repository
https://github.com/void-linux/void-packages/pull/33029#discussion_r715683346
Comment:
done
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Merged]: docker-compose, python3-docker, python3-docker-pycreds
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
` (16 preceding siblings ...)
2021-09-24 14:54 ` [PR REVIEW] " dmarto
@ 2021-09-26 12:49 ` paper42
17 siblings, 0 replies; 19+ messages in thread
From: paper42 @ 2021-09-26 12:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 806 bytes --]
There's a merged pull request on the void-packages repository
docker-compose, python3-docker, python3-docker-pycreds
https://github.com/void-linux/void-packages/pull/33029
Description:
#### 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.
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2021-09-26 12:49 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-20 4:10 [PR PATCH] docker-compose, python3-docker, python3-docker-pycreds dmarto
2021-09-20 5:10 ` [PR PATCH] [Updated] " dmarto
2021-09-20 5:11 ` dmarto
2021-09-20 5:12 ` dmarto
2021-09-20 5:17 ` dmarto
2021-09-20 5:18 ` dmarto
2021-09-20 5:19 ` dmarto
2021-09-20 5:24 ` [PR PATCH] [Updated] " dmarto
2021-09-20 5:27 ` dmarto
2021-09-20 18:19 ` dmarto
2021-09-21 22:11 ` paper42
2021-09-22 5:51 ` dmarto
2021-09-23 19:49 ` [PR PATCH] [Updated] " dmarto
2021-09-23 20:02 ` dmarto
2021-09-24 8:31 ` [PR REVIEW] " paper42
2021-09-24 8:31 ` paper42
2021-09-24 14:54 ` [PR PATCH] [Updated] " dmarto
2021-09-24 14:54 ` [PR REVIEW] " dmarto
2021-09-26 12:49 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).