[bug#36608] [PATCH] Update docker-compose to 1.24.1.

[bug#36608] [PATCH] Update docker-compose to 1.24.1.

[Jacob MacDonald]

Several patches incoming, I'm spacing them out this time after
realizing attachments weren't sorted in my last ticket. Sorry about
that.

[bug#36608] [PATCH 1/9] Update docker-compose to 1.24.1.

[Jacob MacDonald]

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



[-- Attachment #2: 0001-gnu-Add-python-cached-property.patch --]
[-- Type: text/x-patch, Size: 2093 bytes --]

From 867b96a4dc461b0496a3ffbf8af7f97892f01cde Mon Sep 17 00:00:00 2001
From: Jacob MacDonald <jaccarmac@gmail.com>
Date: Thu, 11 Jul 2019 15:43:31 -0500
Subject: [PATCH 1/9] gnu: Add python-cached-property.

* gnu/packages/python-xyz.scm (python-cached-property): New variable.
---
 gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 49d5126e02..2dee18292b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15923,3 +15923,39 @@ Complete support for Berkeley DB Base Replication.  Support for RPC.")
 types for further processing.  It is primarily intended for batch jobs and
 one-off scripts.")
     (license license:expat)))
+
+(define-public python-cached-property
+  (package
+    (name "python-cached-property")
+    (version "1.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "cached-property" version))
+       (sha256
+        (base32
+         "010m1bl380l2r3vwq24r5v14l6gwvgm9v0mqqjkjss552jgsa5wj"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; https://github.com/pydanny/cached-property/issues/131
+         ;; recent versions of freezegun break one test
+         (add-after 'unpack 'disable-broken-test
+           (lambda _
+             (substitute* "tests/test_cached_property.py"
+               (("def test_threads_ttl_expiry\\(self\\)" m)
+                (string-append "@unittest.skip(\"Disabled by Guix\")\n"
+                               "    " m)))
+             #t)))))
+    (native-inputs
+     `(("python-freezegun" ,python-freezegun)))
+    (home-page
+     "https://github.com/pydanny/cached-property")
+    (synopsis
+     "Decorator for caching properties in classes")
+    (description
+     "This package provides a decorator which makes caching
+time-or-computationally-expensive properties quick and easy and works in Python
+2 or 3.")
+    (license license:bsd-3)))
-- 
2.22.0

[bug#36608] [PATCH 2/9] Update docker-compose to 1.24.1.

[Jacob MacDonald]

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



[-- Attachment #2: 0002-gnu-Add-python-urllib3-1.24.patch --]
[-- Type: text/x-patch, Size: 1285 bytes --]

From 758c97ef60e00309d8e6e20ff06eecb4bc44928d Mon Sep 17 00:00:00 2001
From: Jacob MacDonald <jaccarmac@gmail.com>
Date: Thu, 11 Jul 2019 15:42:10 -0500
Subject: [PATCH 2/9] gnu: Add python-urllib3-1.24.

* gnu/packages/python-web.scm (python-urllib3-1.24): New variable.
---
 gnu/packages/python-web.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index e441cbaa81..04f53740e4 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1528,6 +1528,18 @@ can reuse the same socket connection for multiple requests, it can POST files,
 supports url redirection and retries, and also gzip and deflate decoding.")
     (license license:expat)))
 
+;; Some software requires an older version of urllib3, notably Docker.
+(define-public python-urllib3-1.24
+  (package (inherit python-urllib3)
+           (version "1.24.3")
+           (source (origin
+                     (method url-fetch)
+                     (uri (pypi-uri "urllib3" version))
+                     (sha256
+                      (base32
+                       "1x0slqrv6kixkbcdnxbglvjliwhc1payavxjvk8fvbqjrnasd4r3"))))))
+
+
 (define-public python2-urllib3
   (package-with-python2 python-urllib3))
 
-- 
2.22.0

[bug#36608] [PATCH 3/9] Update docker-compose to 1.24.1.

[Jacob MacDonald]

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



[-- Attachment #2: 0003-gnu-Add-python-idna-2.7.patch --]
[-- Type: text/x-patch, Size: 1118 bytes --]

From 9158b4fdfd89725230895350ce3cee705ce30024 Mon Sep 17 00:00:00 2001
From: Jacob MacDonald <jaccarmac@gmail.com>
Date: Thu, 11 Jul 2019 15:42:37 -0500
Subject: [PATCH 3/9] gnu: Add python-idna-2.7.

* gnu/packages/python-xyz.scm (python-idna-2.7): New variable.
---
 gnu/packages/python-xyz.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 2dee18292b..731e037b7f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7201,6 +7201,17 @@ the Python standard library but currently only supports the older 2003
 specification.")
     (license license:bsd-4)))
 
+(define-public python-idna-2.7
+  (package (inherit python-idna)
+           (version "2.7")
+           (source (origin
+                     (method url-fetch)
+                     (uri (pypi-uri "idna" version))
+                     (sha256
+                      (base32
+                       "05jam7d31767dr12x0rbvvs8lxnpb1mhdb2zdlfxgh83z6k3hjk8"))))))
+
+
 (define-public python2-idna
   (package-with-python2 python-idna))
 
-- 
2.22.0

[bug#36608] [PATCH 4/9] Update docker-compose to 1.24.1.

[Jacob MacDonald]

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



[-- Attachment #2: 0004-gnu-Add-python-requests-2.20.patch --]
[-- Type: text/x-patch, Size: 1473 bytes --]

From 5c5e79fa7d9d492e73d66298616f9921c92bace5 Mon Sep 17 00:00:00 2001
From: Jacob MacDonald <jaccarmac@gmail.com>
Date: Thu, 11 Jul 2019 15:41:26 -0500
Subject: [PATCH 4/9] gnu: Add python-requests-2.20.

* gnu/packages/python-web.scm (python-requests-2.20): New variable.
---
 gnu/packages/python-web.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 04f53740e4..72d4eba0ff 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1352,6 +1352,22 @@ WebSocket usage in Python programs.")
 than Python’s urllib2 library.")
     (license license:asl2.0)))
 
+;; Some software requires an older version of Requests, notably Docker/Docker
+;; Compose.
+(define-public python-requests-2.20
+  (package (inherit python-requests)
+           (version "2.20.1")
+           (source (origin
+                     (method url-fetch)
+                     (uri (pypi-uri "requests" version))
+                     (sha256
+                      (base32
+                       "0qzj6cgv3k9wyj7wlxgz7xq0cfg4jbbkfm24pp8dnhczwl31527a"))))
+           (propagated-inputs
+            `(("python-urllib3" ,python-urllib3-1.24)
+              ("python-idna" ,python-idna-2.7)
+              ,@(package-propagated-inputs python-requests)))))
+
 ;; Some software requires an older version of Requests, notably Docker
 ;; Compose.
 (define-public python-requests-2.7
-- 
2.22.0

[bug#36608] [PATCH 5/9] Update docker-compose to 1.24.1.

[Jacob MacDonald]

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



[-- Attachment #2: 0005-gnu-python-texttable-Update-to-0.9.1.patch --]
[-- Type: text/x-patch, Size: 1142 bytes --]

From 82c77855aaeae69193c589410e4f76ce7e80c329 Mon Sep 17 00:00:00 2001
From: Jacob MacDonald <jaccarmac@gmail.com>
Date: Thu, 11 Jul 2019 15:43:03 -0500
Subject: [PATCH 5/9] gnu: python-texttable: Update to 0.9.1.

* gnu/packages/python-xyz.scm (python-texttable): Update to 0.9.1.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 731e037b7f..a904bf9e16 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8118,14 +8118,14 @@ the standard library.")
 (define-public python-texttable
   (package
     (name "python-texttable")
-    (version "0.8.7")
+    (version "0.9.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "texttable" version))
        (sha256
         (base32
-         "1liiiydgkg37i46a418aw19fyf6z3ds51wdwwpyjbs12x0phhf4a"))))
+         "0yawv64c0zbawwv6zz84whb32fnb2n9jylwjcfsrcdgh7xvl340i"))))
     (build-system python-build-system)
     (arguments '(#:tests? #f)) ; no tests
     (home-page "https://github.com/foutaise/texttable/")
-- 
2.22.0

[bug#36608] [PATCH 6/9] Update docker-compose to 1.24.1.

[Jacob MacDonald]

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



[-- Attachment #2: 0006-gnu-python-docker-pycreds-Update-to-0.4.0.patch --]
[-- Type: text/x-patch, Size: 1134 bytes --]

From 8778d69652a250567e292d1494489de5dcd8b533 Mon Sep 17 00:00:00 2001
From: Jacob MacDonald <jaccarmac@gmail.com>
Date: Thu, 11 Jul 2019 15:39:48 -0500
Subject: [PATCH 6/9] gnu: python-docker-pycreds: Update to 0.4.0.

* gnu/packages/docker.scm (python-docker-pycreds): Update to 0.4.0.
---
 gnu/packages/docker.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index bb981665d6..fac7d4889a 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -129,14 +129,14 @@ created and all the services are started as specified in the configuration.")
 (define-public python-docker-pycreds
   (package
     (name "python-docker-pycreds")
-    (version "0.3.0")
+    (version "0.4.0")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "docker-pycreds" version))
         (sha256
          (base32
-          "1zxvam1q22qb0jf48553nnncnfrcp88ag4xa0qmq6vr0imn9a3lb"))))
+          "1m44smrggnqghxkqfl7vhapdw89m1p3vdr177r6cq17lr85jgqvc"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
-- 
2.22.0

[bug#36608] [PATCH 7/9] Update docker-compose to 1.24.1.

[Jacob MacDonald]

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



[-- Attachment #2: 0007-gnu-python-dockerpty-Update-to-0.4.1.patch --]
[-- Type: text/x-patch, Size: 1065 bytes --]

From fef43a887916608104244aeab14c00f0968025c6 Mon Sep 17 00:00:00 2001
From: Jacob MacDonald <jaccarmac@gmail.com>
Date: Thu, 11 Jul 2019 15:39:18 -0500
Subject: [PATCH 7/9] gnu: python-dockerpty: Update to 0.4.1.

* gnu/packages/docker.scm (python-dockerpty): Update to 0.4.1.
---
 gnu/packages/docker.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index fac7d4889a..e4a7d4c2fd 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -73,14 +73,14 @@ management tool.")
 (define-public python-dockerpty
   (package
     (name "python-dockerpty")
-    (version "0.3.4")
+    (version "0.4.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "dockerpty" version))
        (sha256
         (base32
-         "0za6rr349641wv76ww9l3zcic2xyxrirlxpnzl4296h897648455"))))
+         "1kjn64wx23jmr8dcc6g7bwlmrhfmxr77gh6iphqsl39sayfxdab9"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-six" ,python-six)))
-- 
2.22.0

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

[Jacob MacDonald]

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



[-- Attachment #2: 0008-gnu-python-docker-py-Update-to-3.7.3.patch --]
[-- Type: text/x-patch, Size: 2042 bytes --]

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

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

[Jacob MacDonald]

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



[-- Attachment #2: 0009-gnu-docker-compose-Update-to-1.24.1.patch --]
[-- Type: text/x-patch, Size: 1986 bytes --]

From d7b8d3fe4739ecfb2935fd445d0a164b32fc2f12 Mon Sep 17 00:00:00 2001
From: Jacob MacDonald <jaccarmac@gmail.com>
Date: Thu, 11 Jul 2019 15:36:36 -0500
Subject: [PATCH 9/9] gnu: docker-compose: Update to 1.24.1.

* gnu/packages/docker.scm (docker-compose): Update to 1.24.1.
---
 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 de69524404..9d96a6345b 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -103,25 +103,32 @@ client.")
 (define-public docker-compose
   (package
     (name "docker-compose")
-    (version "1.5.2")
+    (version "1.24.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "docker-compose" version))
        (sha256
         (base32
-         "0ksg7hm2yvc977968dixxisrhcmvskzpcx3pz0v1kazrdqp7xakr"))))
+         "0lx7bx6jvhydbab8vwry0bclhdf0dfj6jrns1m5y45yp9ybqxmd5"))))
     (build-system python-build-system)
     ;; TODO: Tests require running Docker daemon.
     (arguments '(#:tests? #f))
     (inputs
-     `(("python-docker-py" ,python-docker-py)
+     `(("python2-backport-ssl-match-hostname"
+        ,python2-backport-ssl-match-hostname)
+       ("python-cached-property"
+        ,python-cached-property)
+       ("python-colorama" ,python-colorama)
+       ("python-docker-py" ,python-docker-py)
        ("python-docker-pycreds" ,python-docker-pycreds)
        ("python-dockerpty" ,python-dockerpty)
        ("python-docopt" ,python-docopt)
+       ("python-ipaddress" ,python-ipaddress)
+       ("python-paramiko" ,python-paramiko)
        ("python-jsonschema" ,python-jsonschema-2.6)
        ("python-pyyaml" ,python-pyyaml)
-       ("python-requests" ,python-requests-2.7)
+       ("python-requests" ,python-requests-2.20)
        ("python-six" ,python-six)
        ("python-texttable" ,python-texttable)
        ("python-websocket-client" ,python-websocket-client)))
-- 
2.22.0

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

[Ludovic Courtès]

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’.

[bug#36608] [PATCH] Update docker-compose to 1.24.1.

[Ludovic Courtès]

BTW, since you don’t seem to be using ‘git send-email’, you can just as
well attach all the patches to a single message.  (Though I recommend
‘git send-email’, which is really easy to use.)

Ludo’.