From unknown Wed Sep 10 01:09:07 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#40136 <40136@debbugs.gnu.org> To: bug#40136 <40136@debbugs.gnu.org> Subject: Status: [PATCH] * gnu/packages/docker.scm (docker-compose): update to 1.25.4 Reply-To: bug#40136 <40136@debbugs.gnu.org> Date: Wed, 10 Sep 2025 08:09:07 +0000 retitle 40136 [PATCH] * gnu/packages/docker.scm (docker-compose): update to= 1.25.4 reassign 40136 guix-patches submitter 40136 Michael Rohleder severity 40136 normal tag 40136 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 19 14:55:07 2020 Received: (at submit) by debbugs.gnu.org; 19 Mar 2020 18:55:07 +0000 Received: from localhost ([127.0.0.1]:43625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jF0Ju-0000SY-K8 for submit@debbugs.gnu.org; Thu, 19 Mar 2020 14:55:07 -0400 Received: from lists.gnu.org ([209.51.188.17]:58518) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jF0Jt-0000SQ-06 for submit@debbugs.gnu.org; Thu, 19 Mar 2020 14:55:05 -0400 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,URIBL_BLOCKED autolearn=disabled version=3.3.2 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 www.rohleder.de ([37.61.204.227]); authenticated by wp224.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1jF0Jm-0005NQ-E5; Thu, 19 Mar 2020 19:54:58 +0100 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 Received: by micha (sSMTP sendmail emulation); Thu, 19 Mar 2020 19:54:46 +0100 From: Michael Rohleder To: guix-patches@gnu.org Subject: [PATCH] * gnu/packages/docker.scm (docker-compose): update to 1.25.4 X-PGP-Fingerprint: 755E 2DE5 D0D5 85C5 2E78 2830 7C7A FFBE FEF2 CB25 X-PGP-Key: https://www.rohleder.de/~mike/pgpkey.asc 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" X-bounce-key: webpack.hosteurope.de;mike@rohleder.de;1584644101;b0da055e; X-HE-SMSGID: 1jF0Jm-0005NQ-E5 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a01:488:42:1000:50ed:84e7:: X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --==-=-= 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----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 19 15:45:50 2020 Received: (at 40136-done) by debbugs.gnu.org; 19 Mar 2020 19:45:50 +0000 Received: from localhost ([127.0.0.1]:43652 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jF170-0001mf-KF for submit@debbugs.gnu.org; Thu, 19 Mar 2020 15:45:50 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:36288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jF16x-0001mL-Ay; Thu, 19 Mar 2020 15:45:47 -0400 Received: from localhost (80-110-126-163.cgn.dynamic.surfer.at [80.110.126.163]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 732A63367BF8; Thu, 19 Mar 2020 20:45:45 +0100 (CET) Date: Thu, 19 Mar 2020 20:45:44 +0100 From: Danny Milosavljevic To: Michael Rohleder Subject: Re: [bug#40136] [PATCH] * gnu/packages/docker.scm (docker-compose): update to 1.25.4 Message-ID: <20200319204544.40f7085e@scratchpost.org> In-Reply-To: <871rpoxjih.fsf@rohleder.de> References: <871rpoxjih.fsf@rohleder.de> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/nXoKSbtNRaesFArXFuNDm3R"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40136-done Cc: 40015-done@debbugs.gnu.org, 40136-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/nXoKSbtNRaesFArXFuNDm3R Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi, thanks for the patch! Pushed to guix master as commit 15c3aa091100160bbe9c81650f9ab7a12bd7964e. --Sig_/nXoKSbtNRaesFArXFuNDm3R Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl5zy+gACgkQ5xo1VCww uqXDbAf+KXtemjGpw01QN8hAVyAOhnFrYv8CximA8mh4/LBGAeQdNp5vFkzjWBg7 Uj+X+rIDdaVjMb0V9i4ihYtfnrzjKA2ZZEv9MwOalOgrxI6cihTEwD7jb2j8E/Fq 2VSPv3RK4/anKisdPVIO72KkkeWR8DPv0eJZsAHOJzj7C1zg44QFyS75nB7JultR SjMuQvfkei/7a+Tp9DsEf5G1jXZYATV/PJTfdhPRgRDsZkKIv+EPghuYnQUndx0Q KWuAE9WpNR6t3v+36jq8KsFVrCtovYbc/xQwqLs0uLD9nH3KcsEWsmaZQnuOJ+/K FXLAX8azGG79jPKCw5a0RTxhmBqLyg== =xA1C -----END PGP SIGNATURE----- --Sig_/nXoKSbtNRaesFArXFuNDm3R-- From unknown Wed Sep 10 01:09:07 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 17 Apr 2020 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator