[PR PATCH] Docker compose update

[PR PATCH] Docker compose update

[kartikynwa]

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

There is a new pull request by kartikynwa against master on the void-packages repository

https://github.com/kartikynwa/void-packages docker-compose-update
https://github.com/void-linux/void-packages/pull/24588

Docker compose update


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

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

From 9ecf37a0b465e1611a020c2541cbe46cc152f466 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Tue, 1 Sep 2020 12:58:30 +0530
Subject: [PATCH 1/3] New packages: python-dotenv-0.14.0, python3-dotenv-0.14.0

---
 srcpkgs/python-dotenv/template | 29 +++++++++++++++++++++++++++++
 srcpkgs/python3-dotenv         |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 srcpkgs/python-dotenv/template
 create mode 120000 srcpkgs/python3-dotenv

diff --git a/srcpkgs/python-dotenv/template b/srcpkgs/python-dotenv/template
new file mode 100644
index 00000000000..cd3787d9ba9
--- /dev/null
+++ b/srcpkgs/python-dotenv/template
@@ -0,0 +1,29 @@
+# Template file for 'python-dotenv'
+pkgname=python-dotenv
+version=0.14.0
+revision=1
+archs=noarch
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python-click"
+short_desc="Module to get and set variables in .env files (Python2)"
+maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/theskumar/python-dotenv"
+distfiles="https://github.com/theskumar/python-dotenv/archive/v${version}.tar.gz"
+checksum=ed0ccb333acaa02a12a9510fef1909fca891e8da454ba24777b4ce407f403b5f
+
+post_install() {
+	vlicense LICENSE
+}
+
+python3-dotenv_package() {
+	archs=noarch
+	depends="python3-click"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove usr/bin/dotenv3
+		vmove usr/lib/python3*
+		vlicense LICENSE
+	}
+}
diff --git a/srcpkgs/python3-dotenv b/srcpkgs/python3-dotenv
new file mode 120000
index 00000000000..3e338bfa253
--- /dev/null
+++ b/srcpkgs/python3-dotenv
@@ -0,0 +1 @@
+python-dotenv
\ No newline at end of file

From 2c401f85ee8b79f7b5171ca150f7f11a2c29a446 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Tue, 1 Sep 2020 13:00:42 +0530
Subject: [PATCH 2/3] python-docker, python3-docker: update to 4.3.1

---
 srcpkgs/python-docker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-docker/template b/srcpkgs/python-docker/template
index 1a325bd6c46..4d004057a37 100644
--- a/srcpkgs/python-docker/template
+++ b/srcpkgs/python-docker/template
@@ -1,6 +1,6 @@
 # Template file for 'python-docker'
 pkgname=python-docker
-version=4.2.0
+version=4.3.1
 revision=1
 archs=noarch
 wrksrc="docker-${version}"
@@ -13,7 +13,7 @@ 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=ddae66620ab5f4bce769f64bcd7934f880c8abe6aa50986298db56735d0f722e
+checksum=bad94b8dd001a8a4af19ce4becc17f41b09f228173ffe6a4e0355389eef142f2
 
 python3-docker_package() {
 	archs=noarch

From e3019b9a6097571b9497c85d5ae496ae8dd0ec13 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Tue, 1 Sep 2020 13:01:29 +0530
Subject: [PATCH 3/3] docker-compose: update to 2.26.1

---
 srcpkgs/docker-compose/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index d381a1091d0..ad6b6ebff29 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,6 +1,6 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
-version=1.25.5
+version=1.26.2
 revision=1
 archs=noarch
 wrksrc="compose-${version}"
@@ -9,19 +9,15 @@ hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-docker>=3.7.0
  python3-dockerpty python3-websocket-client python3-requests python3-docopt
  python3-yaml python3-six python3-texttable python3-cached-property
- python3-paramiko>=2.4.2"
+ python3-paramiko>=2.4.2 python3-dotenv python3-distro python3-pysocks"
 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=c04d4858b456f5806618fe7a49fadd3f1ccb8f10cf6e499bcf7fdee80a93c21a
+checksum=a4999bcb838ca9e88ff992fedd7a32ab71f97ae081696f8bf26fa1da54aaffe6
 
 
-pre_build() {
-	# relax texttable and requests upper bound
-	sed -i '/texttable/s/, < 0.10//;/requests/s/, < 2\.21//' setup.py
-}
 post_install() {
 	vinstall contrib/completion/bash/docker-compose 644 \
 		usr/share/bash-completion/completions docker-compose

Re: Docker compose update

[kartikynwa]

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

New comment by kartikynwa on void-packages repository

https://github.com/void-linux/void-packages/pull/24588#issuecomment-686247017

Comment:
> Just include `python3-dotenv` instead of a combined template that also includes `python-dotenv`. Because py2 is EOL, we aren't accepting new py2 packages, and this will just create more work later if (when)
> upstream drops py2 support.

Would this mean discarding the python2 related files that are built?

Re: [PR PATCH] [Updated] Docker compose update

[kartikynwa]

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

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

https://github.com/kartikynwa/void-packages docker-compose-update
https://github.com/void-linux/void-packages/pull/24588

Docker compose update


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

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

From 921c032a31dc0442d20099b5f5941faa8ac99925 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Tue, 1 Sep 2020 12:58:30 +0530
Subject: [PATCH 1/3] New package: python3-dotenv-0.14.0

---
 srcpkgs/python3-dotenv/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-dotenv/template

diff --git a/srcpkgs/python3-dotenv/template b/srcpkgs/python3-dotenv/template
new file mode 100644
index 00000000000..b771ad0139d
--- /dev/null
+++ b/srcpkgs/python3-dotenv/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-dotenv'
+pkgname=python3-dotenv
+version=0.14.0
+revision=1
+archs=noarch
+wrksrc="python-dotenv-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-click"
+short_desc="Python module to get and set variables in .env files"
+maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/theskumar/python-dotenv"
+distfiles="https://github.com/theskumar/python-dotenv/archive/v${version}.tar.gz"
+checksum=ed0ccb333acaa02a12a9510fef1909fca891e8da454ba24777b4ce407f403b5f
+
+post_install() {
+	vlicense LICENSE
+}

From b73ce2f41d39174cb2f0c134900c15a26891a472 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Tue, 1 Sep 2020 13:00:42 +0530
Subject: [PATCH 2/3] python-docker, python3-docker: update to 4.3.1

---
 srcpkgs/python-docker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-docker/template b/srcpkgs/python-docker/template
index 1a325bd6c46..4d004057a37 100644
--- a/srcpkgs/python-docker/template
+++ b/srcpkgs/python-docker/template
@@ -1,6 +1,6 @@
 # Template file for 'python-docker'
 pkgname=python-docker
-version=4.2.0
+version=4.3.1
 revision=1
 archs=noarch
 wrksrc="docker-${version}"
@@ -13,7 +13,7 @@ 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=ddae66620ab5f4bce769f64bcd7934f880c8abe6aa50986298db56735d0f722e
+checksum=bad94b8dd001a8a4af19ce4becc17f41b09f228173ffe6a4e0355389eef142f2
 
 python3-docker_package() {
 	archs=noarch

From fb8cc6f6c7b4561f159579a8e5f5abf925ca96c0 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Tue, 1 Sep 2020 13:01:29 +0530
Subject: [PATCH 3/3] docker-compose: update to 2.26.1

---
 srcpkgs/docker-compose/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index d381a1091d0..ad6b6ebff29 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,6 +1,6 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
-version=1.25.5
+version=1.26.2
 revision=1
 archs=noarch
 wrksrc="compose-${version}"
@@ -9,19 +9,15 @@ hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-docker>=3.7.0
  python3-dockerpty python3-websocket-client python3-requests python3-docopt
  python3-yaml python3-six python3-texttable python3-cached-property
- python3-paramiko>=2.4.2"
+ python3-paramiko>=2.4.2 python3-dotenv python3-distro python3-pysocks"
 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=c04d4858b456f5806618fe7a49fadd3f1ccb8f10cf6e499bcf7fdee80a93c21a
+checksum=a4999bcb838ca9e88ff992fedd7a32ab71f97ae081696f8bf26fa1da54aaffe6
 
 
-pre_build() {
-	# relax texttable and requests upper bound
-	sed -i '/texttable/s/, < 0.10//;/requests/s/, < 2\.21//' setup.py
-}
 post_install() {
 	vinstall contrib/completion/bash/docker-compose 644 \
 		usr/share/bash-completion/completions docker-compose

Re: docker-compose: update to 2.26.1

[kartikynwa]

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

New comment by kartikynwa on void-packages repository

https://github.com/void-linux/void-packages/pull/24588#issuecomment-686292780

Comment:
@ahesford It is done!! Also sorry for bad title. Was a mistake.

Re: docker-compose: update to 2.26.1

[kartikynwa]

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

New comment by kartikynwa on void-packages repository

https://github.com/void-linux/void-packages/pull/24588#issuecomment-686247017

Comment:
> Just include `python3-dotenv` instead of a combined template that also includes `python-dotenv`. Because py2 is EOL, we aren't accepting new py2 packages, and this will just create more work later if (when)
> upstream drops py2 support.

~~Would this mean discarding the python2 related files that are built?~~

Choosing `buildstyle=python3-module` as took care of that.

Re: docker-compose: update to 2.26.1

[kartikynwa]

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

New comment by kartikynwa on void-packages repository

https://github.com/void-linux/void-packages/pull/24588#issuecomment-686292780

Comment:
@ahesford It is done!! Also sorry for bad title. Was a mistake.

Edit: Want to mention that `python3-pysocks` is an optional dependency for `docker-compose` as shown [HERE](https://github.com/docker/compose/blob/eefe0d319f966288a8c0438aa51822af8668ee06/setup.py#L64) so feel free to comment on that too.

Re: docker-compose: update to 2.26.1

[kartikynwa]

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

New comment by kartikynwa on void-packages repository

https://github.com/void-linux/void-packages/pull/24588#issuecomment-686247017

Comment:
> Just include `python3-dotenv` instead of a combined template that also includes `python-dotenv`. Because py2 is EOL, we aren't accepting new py2 packages, and this will just create more work later if (when)
> upstream drops py2 support.

~~Would this mean discarding the python2 related files that are built?~~

Choosing `buildstyle=python3-module` took care of that.

Re: [PR PATCH] [Updated] docker-compose: update to 2.26.1

[kartikynwa]

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

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

https://github.com/kartikynwa/void-packages docker-compose-update
https://github.com/void-linux/void-packages/pull/24588

docker-compose: update to 2.26.1


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

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

From 921c032a31dc0442d20099b5f5941faa8ac99925 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Tue, 1 Sep 2020 12:58:30 +0530
Subject: [PATCH 1/3] New package: python3-dotenv-0.14.0

---
 srcpkgs/python3-dotenv/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-dotenv/template

diff --git a/srcpkgs/python3-dotenv/template b/srcpkgs/python3-dotenv/template
new file mode 100644
index 00000000000..b771ad0139d
--- /dev/null
+++ b/srcpkgs/python3-dotenv/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-dotenv'
+pkgname=python3-dotenv
+version=0.14.0
+revision=1
+archs=noarch
+wrksrc="python-dotenv-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-click"
+short_desc="Python module to get and set variables in .env files"
+maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/theskumar/python-dotenv"
+distfiles="https://github.com/theskumar/python-dotenv/archive/v${version}.tar.gz"
+checksum=ed0ccb333acaa02a12a9510fef1909fca891e8da454ba24777b4ce407f403b5f
+
+post_install() {
+	vlicense LICENSE
+}

From b73ce2f41d39174cb2f0c134900c15a26891a472 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Tue, 1 Sep 2020 13:00:42 +0530
Subject: [PATCH 2/3] python-docker, python3-docker: update to 4.3.1

---
 srcpkgs/python-docker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-docker/template b/srcpkgs/python-docker/template
index 1a325bd6c46..4d004057a37 100644
--- a/srcpkgs/python-docker/template
+++ b/srcpkgs/python-docker/template
@@ -1,6 +1,6 @@
 # Template file for 'python-docker'
 pkgname=python-docker
-version=4.2.0
+version=4.3.1
 revision=1
 archs=noarch
 wrksrc="docker-${version}"
@@ -13,7 +13,7 @@ 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=ddae66620ab5f4bce769f64bcd7934f880c8abe6aa50986298db56735d0f722e
+checksum=bad94b8dd001a8a4af19ce4becc17f41b09f228173ffe6a4e0355389eef142f2
 
 python3-docker_package() {
 	archs=noarch

From 7ee9cc4763b4225cf1ac799df70acae44e0fea7f Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Tue, 1 Sep 2020 13:01:29 +0530
Subject: [PATCH 3/3] docker-compose: update to 2.26.1

---
 srcpkgs/docker-compose/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index d381a1091d0..8742e5070f5 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,6 +1,6 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
-version=1.25.5
+version=1.26.2
 revision=1
 archs=noarch
 wrksrc="compose-${version}"
@@ -9,19 +9,15 @@ hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-docker>=3.7.0
  python3-dockerpty python3-websocket-client python3-requests python3-docopt
  python3-yaml python3-six python3-texttable python3-cached-property
- python3-paramiko>=2.4.2"
+ python3-paramiko>=2.4.2 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=c04d4858b456f5806618fe7a49fadd3f1ccb8f10cf6e499bcf7fdee80a93c21a
+checksum=a4999bcb838ca9e88ff992fedd7a32ab71f97ae081696f8bf26fa1da54aaffe6
 
 
-pre_build() {
-	# relax texttable and requests upper bound
-	sed -i '/texttable/s/, < 0.10//;/requests/s/, < 2\.21//' setup.py
-}
 post_install() {
 	vinstall contrib/completion/bash/docker-compose 644 \
 		usr/share/bash-completion/completions docker-compose

Re: docker-compose: update to 2.26.1

[kartikynwa]

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

New comment by kartikynwa on void-packages repository

https://github.com/void-linux/void-packages/pull/24588#issuecomment-686690737

Comment:
@ahesford Done.

Re: [PR PATCH] [Merged]: docker-compose: update to 2.26.1

[ahesford]

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

There's a merged pull request on the void-packages repository

docker-compose: update to 2.26.1
https://github.com/void-linux/void-packages/pull/24588

Description: