diff mbox series

[bug#36608,8/9] Update docker-compose to 1.24.1.

Message ID CACy6W0CBbsC6b8R744FXqjZkc2L6cD4rbSYua=3TyiEfApc-VA@mail.gmail.com
State Accepted
Headers show
Series [bug#36608,1/9] Update docker-compose to 1.24.1. | expand

Commit Message

Jacob MacDonald July 11, 2019, 8:52 p.m. UTC

Comments

Ludovic Courtès July 13, 2019, 1:16 p.m. UTC | #1 
Hello,

Jacob MacDonald <jaccarmac@gmail.com> skribis:

> From ce4ba389f4feb4be00ab0f1910ec4114e0c41a15 Mon Sep 17 00:00:00 2001
> From: Jacob MacDonald <jaccarmac@gmail.com>
> Date: Thu, 11 Jul 2019 15:38:17 -0500
> Subject: [PATCH 8/9] gnu: python-docker-py: Update to 3.7.3.
>
> * gnu/packages/docker.scm (python-docker-py): Update to 3.7.3.

[...]

>      (inputs
> -     `(("python-requests" ,python-requests)
> +     `(("python2-backport-ssl-match-hostname"
> +        ,python2-backport-ssl-match-hostname)

AFAICS ‘python2-backport-ssl-match-hostname’ is unnecessary here since
it’s a Python 3.x package.  So I took the liberty to remove it.

I also adjusted the commit log so that it mentions all the changes made
to the package, including ‘inputs’ changes.

I added a copyright line for you in python-xyz.scm and pushed the whole
series.

Thank you!

Ludo’.
diff mbox series

Patch

From ce4ba389f4feb4be00ab0f1910ec4114e0c41a15 Mon Sep 17 00:00:00 2001
From: Jacob MacDonald <jaccarmac@gmail.com>
Date: Thu, 11 Jul 2019 15:38:17 -0500
Subject: [PATCH 8/9] gnu: python-docker-py: Update to 3.7.3.

* gnu/packages/docker.scm (python-docker-py): Update to 3.7.3.
---
 gnu/packages/docker.scm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index e4a7d4c2fd..de69524404 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -39,6 +39,7 @@ 
   #:use-module (gnu packages networking)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages version-control)
@@ -49,20 +50,26 @@ 
 (define-public python-docker-py
   (package
     (name "python-docker-py")
-    (version "1.10.6")
+    (version "3.7.3")
     (source
      (origin
        (method url-fetch)
-       (uri (pypi-uri "docker-py" version))
+       (uri (pypi-uri "docker" version))
        (sha256
         (base32
-         "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc"))))
+         "0qmrcvpaz37p85hfddsd4yc8hgqlkzs4cz09q9wmy0pz5pwajqm0"))))
     (build-system python-build-system)
     ;; TODO: Tests require a running Docker daemon.
     (arguments '(#:tests? #f))
     (inputs
-     `(("python-requests" ,python-requests)
+     `(("python2-backport-ssl-match-hostname"
+        ,python2-backport-ssl-match-hostname)
+       ("python-requests" ,python-requests-2.20)
+       ("python-docker-pycreds" ,python-docker-pycreds)
+       ("python-ipaddress" ,python-ipaddress)
+       ("python-paramiko" ,python-paramiko)
        ("python-six" ,python-six)
+       ("python-urllib3" ,python-urllib3-1.24)
        ("python-websocket-client" ,python-websocket-client)))
     (home-page "https://github.com/docker/docker-py/")
     (synopsis "Python client for Docker")
-- 
2.22.0