From patchwork Thu Mar 19 18:54:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Rohleder X-Patchwork-Id: 20779 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B0B3627BBEA; Thu, 19 Mar 2020 18:57:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1B13B27BBE4 for ; Thu, 19 Mar 2020 18:57:07 +0000 (GMT) Received: from localhost ([::1]:41876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jF0Lq-000392-IY for patchwork@mira.cbaines.net; Thu, 19 Mar 2020 14:57:06 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#40136] [PATCH] * gnu/packages/docker.scm (docker-compose): update to 1.25.4 Resent-From: Michael Rohleder Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Mar 2020 18:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40136 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40136@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15846441071774 (code B ref -1); Thu, 19 Mar 2020 18:56:01 +0000 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 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 * gnu/packages/python-xyz.scm (python-jsonschema-2.6): remove variable. From 69518dd1935db9ad58e43572688e8d72d645f501 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): remove variable. --- 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 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2306,32 +2306,6 @@ compare, diff, and patch JSON and JSON-like structures in Python.") `(("python2-functools32" ,python2-functools32) ,@(package-propagated-inputs jsonschema)))))) -;; This old version is still required by docker-compose as of 1.24.0. -(define-public python-jsonschema-2.6 - (package - (name "python-jsonschema") - (version "2.6.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "jsonschema" version)) - (sha256 - (base32 - "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg")))) - (build-system python-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check (lambda _ (invoke "nosetests")))))) - (native-inputs - `(("python-nose" ,python-nose) - ("python-vcversioner" ,python-vcversioner))) - (home-page "https://github.com/Julian/jsonschema") - (synopsis "Implementation of JSON Schema for Python") - (description - "Jsonschema is an implementation of JSON Schema for Python.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-jsonschema)))))) - (define-public python-schema (package (name "python-schema") -- 2.25.2