From patchwork Mon Apr 11 22:28:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: daniel.herzig@outlook.at X-Patchwork-Id: 38526 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 0917827BBEA; Mon, 11 Apr 2022 23:39:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7A43527BBE9 for ; Mon, 11 Apr 2022 23:39:05 +0100 (BST) Received: from localhost ([::1]:39968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ne2ga-0004ZU-Ix for patchwork@mira.cbaines.net; Mon, 11 Apr 2022 18:39:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ne2ch-0004Bl-H2 for guix-patches@gnu.org; Mon, 11 Apr 2022 18:35:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52433) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ne2cg-0000dG-3n for guix-patches@gnu.org; Mon, 11 Apr 2022 18:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ne2cf-0007Rh-V0 for guix-patches@gnu.org; Mon, 11 Apr 2022 18:35:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54866] [PATCH] docker-compose, python-pyyaml Resent-From: daniel.herzig@outlook.at Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 11 Apr 2022 22:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54866 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54866@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164971645128554 (code B ref -1); Mon, 11 Apr 2022 22:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Apr 2022 22:34:11 +0000 Received: from localhost ([127.0.0.1]:46330 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ne2br-0007QU-0l for submit@debbugs.gnu.org; Mon, 11 Apr 2022 18:34:11 -0400 Received: from lists.gnu.org ([209.51.188.17]:55530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ne2bp-0007QN-Tp for submit@debbugs.gnu.org; Mon, 11 Apr 2022 18:34:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ne2bp-00049W-MN for guix-patches@gnu.org; Mon, 11 Apr 2022 18:34:09 -0400 Received: from mail-ve1eur01olkn080d.outbound.protection.outlook.com ([2a01:111:f400:fe1f::80d]:58622 helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ne2bn-0000Xb-Jd for guix-patches@gnu.org; Mon, 11 Apr 2022 18:34:09 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FByVG2jJUxE8AO8qMQcpCJu5HkAxz5Mq+TZUgCwxJckKoQKiEbKFcxiwlTFAqOO4cpwGmnFg1rvJLPTD53O+RTztfIYhG6sF7Gvavcp4ZYIfx2ZN5IDzkJfzTAyWKDCFK9EwO4KqpdSrhxKvlC/TLB0+v/tGGBb94YbxETjHhryyv2sSBs4StZGF7CEXflO6+HlC44Vi72q1ZVLmbymEzVjpC9EgnlyXVMJLki2RywjdZVlxk2m4LfbIjn8OrKrBQFy24exCSDpmX8gzqb0mVQ+g4Cj5Sm8I6kv7du4Tc809RKGF4mQPsiio6US/SH/iYjgMuKak4GGPJHuMksSRwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Wx9i00fFTh/eg/qFcJqARAc3ncxiDphsmUbBJL6KfNU=; b=CaEi63ZX/Co6LpsdxM9r3kGHwZ+vjNyY/C01CP5VazeYbYwmEuQuAenimVzhSvAlRXTFSKoX34fyS0k6W5khRBi/3NMcE66ZxAeH9e4b//EP5U8pWm22bex3pyfYvJhq6GMLchCV8dRnYDWf/u3LoWgE6Jf0FgHgLEPKUbU6WdaInvlNY7uTtML0JcyC8IvrK4eyInKQM+KRduBy+mXCsbIyfiMeklgrn1DI+HCO3/Mk8O0xuPmkF4YoEt2JDVQFftNX2QfoeeENFz7oteEzMZy5sCCR+IU4ScBqG1SfIeYf4ntAjNVCA7jPc2G7PoxVCot30yF+J7HoiVZxdDe8gQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from PAXP189MB1831.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:289::20) by DB8P189MB0746.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:12e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Mon, 11 Apr 2022 22:29:02 +0000 Received: from PAXP189MB1831.EURP189.PROD.OUTLOOK.COM ([fe80::d920:4be9:1b91:2624]) by PAXP189MB1831.EURP189.PROD.OUTLOOK.COM ([fe80::d920:4be9:1b91:2624%6]) with mapi id 15.20.5144.030; Mon, 11 Apr 2022 22:29:02 +0000 Message-ID: From: daniel.herzig@outlook.at Date: Tue, 12 Apr 2022 00:28:51 +0200 User-Agent: Evolution 3.42.1 X-TMN: [WVRNEvdr/c48J7DAWEQMeBDfyfREJWw2] X-ClientProxiedBy: VI1PR04CA0081.eurprd04.prod.outlook.com (2603:10a6:803:64::16) To PAXP189MB1831.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:289::20) X-Microsoft-Original-Message-ID: <0f57ec297c9e10ac92c95b5074056a879cbff7be.camel@outlook.at> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7b7782f3-7313-430c-944e-08da1c0aae1d X-MS-TrafficTypeDiagnostic: DB8P189MB0746:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zl5G9jBq1Kn4YshAvQMxMfzbFufsT7ax5+ij7ytFUG1fvYG+RwDPFCykDETNVum9zi5vWqMs732c2L23DwVHd7uJ09KXTFDzbcwNfvzTAhkibcKxbE7XPoAhh8uVzpYL83PsS5TD2MfACu6/3gtrs4mAlBBYtpUFz7WIrbpHAc0NZ26vBdDU0cyqOIdpm9AGnmpZdITHL01Y178NNpeE/qYs3LTnQGhxTMGxYdhUB1Y+W1vNinNPxdYPq9qw0hgWfj/qLOB4V1F9wpr3nXKiJmrK+6bW5KZVCxXVMrzIU+ZycoVjqLKdsc810x+y7sXJweko1tZMEaYzS9km7kTsJOsm82OvlsItvRqQl4D9Dkev+lI2wOHCtZ/M143SxNx0/wqdKFVWQfdukxB6PQ6oGa2JIGvyrEfHTGuenASG0k4vdyodWxD6An8jiwhF6OgpPX2AfeSE8PJzwxeZ9l5s8GBfW5mVYosLmXpEYc6d3HUu6ZfA7bMVevz2JAvs5R6KzZ6BJqN1X6IU9gyXOngxq8OXVvl0lPs3jB3qnHfqXzpbUMu3VmyftxiQMNG/gtjvv75gHGFzYPVnPz3NZfTs7A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3pb+hJ7j+k8+5VuA/yfkZ6wmb+FGX1CkhJO8SLT63CDrvKScyiCvgKmnvyQ0F8Y9NZSJ63KsqgbamM8pI1HGgtIYnZtbYbUWbsJV+/nIATZ65e1hEAOtIlw4UdKz/FttN83wmZkFVhbhyNuqVqfNPii3M0LLUvogSERcMUL+ZHQx2qeOveKQR/BqPkmXTgVEXRVMMY9DHOpwoiYlEU8910joyZ1+U5dBOS3CwYChQnTf5HZeTNWFO4LDuYj4aEHqhCCWkHFe8p73GGZ/1QX0Wb9Qc2zq/OAfsayCuGm7tbRssAV5tQCJ9/Y3wMCUn9GHyzyeR5vynMNEoHFnYSxbc+u4P8yxtub1ApsBueAGHIhttHnvEUIofMJRtHTLdAP2y4hZcQarNeGcR7UwrLszSF7LrbZU+uyFS0cs5TNEiaGsTojzlfL1mgvdYoA7358bVyp35DVHRmnLLT5xh7sgvWrNxecUgHa63ySPKaANUgcZHJ4iP1TVyuwYVmCd63lo3JjJuO+wvc0aLMDfFu7sNUnt+JfoGr/81cEfCyyhhEZc57KZ3xWABtaQMHPk6YP8e72S0f5wYC4631Zapod9yRqc9CcKJroPx62+O/9i8bUwN8ZKEEn68XlO/yHuXyr2xKWlXc9SpBJqsSEVnj6QZaVD847ZeNveIAE8xPgRZzE+gl722tUSOiFCZOEC5qKIaZq/fkzxqQjl2w37LtnTJFK6a3U2mms6Zfs5BZ1RKsy8W/Rfra+vEHljyBuWURHbOj8r4BASVBBReQA0Hd6ClTrv33fHMvFlcckjldQphpq2nqD0ky65/S5b5YhUygyKAj44UK0myE6RFDeQOYwGU8rur8meHfSbYwCD6R7HtSD+N7S2M6fWx30Wvu4zzACOvfXasqa7Vg4yvfhSQq9YIt2rTqRD2hAgfmljzpQ/mChzNxctSsDjCBYBuFmDKY6OzSPnRaqg7G1h/1Vx6hJDpBEqlCfEVPIU7KrNvt7CphrpUWNUC+lmnIZvy83ZTaTRLLxxT/iXOmf2PVzaSO4obKgFbUni5YqzzPXqTCsc4zeBrortMrndOOkzZhg53Dq+i/Sil4v4gsHB7ugmq9GoNaFsV//8OFnNnQGZ/FLGN8/00Cvhb7OvAmGzYuHrP2nnZBa8zbB1FvDXFvmEmeUUPv+ROsEBJw8U+x77Fgm69b/QAef3qJTxz1PV17TYP9JX4MhXUwe19s9qzjf5t/ewHxzr2WDkjeIhtz7WM7ODwYUz84/6dHLqgevL+FRfQ17xMEG6nnsgV4cjqu+HbPNahwuse5WA1xFxOYF3bNWlDpbSaTN7Bg7zTNFOpksEbxki2m6/YgOkV6zgrnEQJbZ8FqjeuGF9BBX/mTcz6PxGNVKSykfriENmMu25sWZ71qr8E5c63X28cKT2TBaGVzDwx7vWHPN0C+EDfE5Fla7FK4y69wflecKGi12IasVGif8R X-OriginatorOrg: sct-15-20-4734-24-msonline-outlook-c54b5.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 7b7782f3-7313-430c-944e-08da1c0aae1d X-MS-Exchange-CrossTenant-AuthSource: PAXP189MB1831.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2022 22:29:02.5896 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8P189MB0746 Received-SPF: pass client-ip=2a01:111:f400:fe1f::80d; envelope-from=daniel.herzig@outlook.at; helo=EUR01-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FROM=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Mon, 11 Apr 2022 18:38:55 -0400 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 Hi Guix, I noticed that after my last pull to 6413d0898b92, docker-compose did not build anymore. The backtrace showed that it fails in the sanity- check-phase due to the requirement python-pyyaml <6. As it builds nicely on guix 9bd4ed3, which still features python-pyyaml@5.4.1 I took the definition from there, re-added it to python-xyz.scm and adjusted docker-compose in docker.scm. You find the patchfile attached, as evolution seems to mess with line-breaks (docker-compose build tested on x86_64 only, as I don't have anything else around). Best & thanks for your great work, Daniel From eab4590fe2c9726920dbe07202616908065dad62 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 12 Apr 2022 00:04:27 +0200 Subject: [PATCH] re-adding python-pyyaml@5.4.1 for compatibility with docker-compose@1.29.2 --- gnu/packages/docker.scm | 2 +- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 3f52f4f8db..07731886ae 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -122,7 +122,7 @@ (define-public docker-compose python-docopt python-dotenv python-jsonschema - python-pyyaml + python-pyyaml-5 python-requests python-six python-texttable diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e83eb017f5..12b538594e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3928,6 +3928,30 @@ (define-public python-pyyaml (license license:expat) (properties `((python2-variant . ,(delay python2-pyyaml)))))) +;; for docker-compose 1.29.2 compatibility +(define-public python-pyyaml-5 + (package + (name "python-pyyaml") + (version "5.4.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyYAML" version)) + (sha256 + (base32 + "0pm440pmpvgv5rbbnm8hk4qga5a292kvlm1bh3x2nwr8pb5p8xv0")))) + (build-system python-build-system) + (inputs + (list libyaml python-cython)) + (home-page "https://pyyaml.org") + (synopsis "YAML parser and emitter for Python") + (description + "PyYAML is a YAML parser and emitter for Python. PyYAML features a +complete YAML 1.1 parser, Unicode support, pickle support, capable extension +API, and sensible error messages. PyYAML supports standard YAML tags and +provides Python-specific tags that represent an arbitrary Python object.") + (license license:expat))) + (define-public python2-pyyaml (let ((base (package-with-python2 (strip-python2-variant python-pyyaml)))) (package base-commit: 6413d0898b92efda8213b3ced0b6d1c736726b89 -- 2.35.1