From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:51291) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jF0Kp-0002Ks-Mi for guix-patches@gnu.org; Thu, 19 Mar 2020 14:56:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jF0Ko-0007z5-5R for guix-patches@gnu.org; Thu, 19 Mar 2020 14:56:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37652) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jF0Ko-0007ye-1o for guix-patches@gnu.org; Thu, 19 Mar 2020 14:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jF0Kn-0000U7-W3 for guix-patches@gnu.org; Thu, 19 Mar 2020 14:56:01 -0400 Subject: [bug#40136] [PATCH] * gnu/packages/docker.scm (docker-compose): update to 1.25.4 Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:50921) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jF0Jr-0001te-GX for guix-patches@gnu.org; Thu, 19 Mar 2020 14:55:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jF0Jp-0006Zd-Uj for guix-patches@gnu.org; Thu, 19 Mar 2020 14:55:03 -0400 Received: from wp224.webpack.hosteurope.de ([2a01:488:42:1000:50ed:84e7::]:37096) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jF0Jp-0006Wz-Jv for guix-patches@gnu.org; Thu, 19 Mar 2020 14:55:01 -0400 Received: from [192.168.1.3] (helo=micha) by www.rohleder.de with smtp (Exim 4.93) (envelope-from ) id 1jF0Jk-0005Ne-SN for guix-patches@gnu.org; Thu, 19 Mar 2020 19:54:58 +0100 From: Michael Rohleder Date: Thu, 19 Mar 2020 19:54:46 +0100 Message-ID: <871rpoxjih.fsf@rohleder.de> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40136@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Fixes I tested this only briefly. I could build and run containers from compose files, so its at least less broken than before where one couldnt even start docker-compose. This doesnt need the old jsonschema-2.6 and seems to work with our current 3.0.1 version, so we can remove it (as stated in the comment). Now, I am wondering if we need all the python-request versions... * gnu/packages/docker.scm (docker-compose): update to 1.25.4 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-packages-docker.scm-docker-compose-update-to-1.2.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH] * gnu/packages/docker.scm (docker-compose): update to 1.25.4 From=20a234bbe7a61f9595ce4ecc0e6367496093f72788 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 19 Mar 2020 18:48:21 +0100 Subject: [PATCH] * gnu/packages/docker.scm (docker-compose): update to 1.25= .4 =2D-- gnu/packages/docker.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 7524a0dc1b..69dee2b856 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -3,6 +3,7 @@ ;;; Copyright =C2=A9 2018 Efraim Flashner ;;; Copyright =C2=A9 2019 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2019 Maxim Cournoyer +;;; Copyright =C2=A9 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -98,19 +99,17 @@ pseudo-terminal (PTY) allocated to a Docker container u= sing the Python client.") (license license:asl2.0))) =20 =2D;; When updating, check whether python-jsonschema-2.6 can be removed fro= m Guix =2D;; entirely. (define-public docker-compose (package (name "docker-compose") =2D (version "1.24.1") + (version "1.25.4") (source (origin (method url-fetch) (uri (pypi-uri "docker-compose" version)) (sha256 (base32 =2D "0lx7bx6jvhydbab8vwry0bclhdf0dfj6jrns1m5y45yp9ybqxmd5")))) + "1ww8ckpj3n5jdg63qvmiqx3gk0fsrnynnnqj17fppymbwjzf5fps")))) (build-system python-build-system) ;; TODO: Tests require running Docker daemon. (arguments '(#:tests? #f)) @@ -120,9 +119,9 @@ client.") ("python-docker-py" ,python-docker-py) ("python-dockerpty" ,python-dockerpty) ("python-docopt" ,python-docopt) =2D ("python-jsonschema" ,python-jsonschema-2.6) + ("python-jsonschema" ,python-jsonschema) ("python-pyyaml" ,python-pyyaml) =2D ("python-requests" ,python-requests-2.20) + ("python-requests" ,python-requests) ("python-six" ,python-six) ("python-texttable" ,python-texttable) ("python-websocket-client" ,python-websocket-client))) =2D-=20 2.25.2 --=-=-= Content-Type: text/plain * gnu/packages/python-xyz.scm (python-jsonschema-2.6): remove variable. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-packages-python-xyz.scm-python-jsonschema-2.6-re.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH] * gnu/packages/python-xyz.scm (python-jsonschema-2.6): remove variable. From=2069518dd1935db9ad58e43572688e8d72d645f501 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 19 Mar 2020 18:56:58 +0100 Subject: [PATCH] * gnu/packages/python-xyz.scm (python-jsonschema-2.6): rem= ove variable. =2D-- gnu/packages/python-xyz.scm | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 07199aa7ca..8271e1ff7e 100644 =2D-- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2306,32 +2306,6 @@ compare, diff, and patch JSON and JSON-like structur= es in Python.") `(("python2-functools32" ,python2-functools32) ,@(package-propagated-inputs jsonschema)))))) =20 =2D;; This old version is still required by docker-compose as of 1.24.0. =2D(define-public python-jsonschema-2.6 =2D (package =2D (name "python-jsonschema") =2D (version "2.6.0") =2D (source (origin =2D (method url-fetch) =2D (uri (pypi-uri "jsonschema" version)) =2D (sha256 =2D (base32 =2D "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg")))) =2D (build-system python-build-system) =2D (arguments =2D '(#:phases =2D (modify-phases %standard-phases =2D (replace 'check (lambda _ (invoke "nosetests")))))) =2D (native-inputs =2D `(("python-nose" ,python-nose) =2D ("python-vcversioner" ,python-vcversioner))) =2D (home-page "https://github.com/Julian/jsonschema") =2D (synopsis "Implementation of JSON Schema for Python") =2D (description =2D "Jsonschema is an implementation of JSON Schema for Python.") =2D (license license:expat) =2D (properties `((python2-variant . ,(delay python2-jsonschema)))))) =2D (define-public python-schema (package (name "python-schema") =2D-=20 2.25.2 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable =2D-=20 Perfection (in design) is achieved not when there is nothing more to add, but rather when there is nothing more to take away. --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEdV4t5dDVhcUueCgwfHr/vv7yyyUFAl5zv/YACgkQfHr/vv7y yyUnnwgAiLumSOQtYyN0tvaFLsncnVhkZcFPw28ZjKswzLBzhLHQek599yDdhM5j 5wX0IG0/ZBsS3iEI4NbxC9WvnoS/wJ76Zyw0A6ducQ4OGjU2C5C19sC5cQuNkWD1 Fd1wYSs/w7Gwvd6f/HfNsxyCmCG5h5HlDV5TghykdTEb8iDFapvwC9oA0QezNNej whgcdKFnT3YqcxfWonY0eCsuLfm2VPNUCZz18cVCq1cgteETTMK1gJ0E7jbrx/b/ p5M2JkGgaXHXkb1SOyHXB39Aa0eI8sRijoWg/zIPMGymOojgDY6mZXxYeYvdhYXj 7sN/z1lxcR975k+Q9irpHwj/wmfcKQ== =IAwc -----END PGP SIGNATURE----- --==-=-=--