From patchwork Fri Apr 8 18:37:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 38452 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 7158927BBEA; Fri, 8 Apr 2022 19:39:12 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 1C80027BBE9 for ; Fri, 8 Apr 2022 19:39:12 +0100 (BST) Received: from localhost ([::1]:37602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nctVn-0002hx-B0 for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 14:39:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45352) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nctUm-00026Z-6y for guix-patches@gnu.org; Fri, 08 Apr 2022 14:38:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42063) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nctUj-0003yd-U7 for guix-patches@gnu.org; Fri, 08 Apr 2022 14:38:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nctUh-00040p-RL for guix-patches@gnu.org; Fri, 08 Apr 2022 14:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54798] [PATCH 4/5] gnu: awscli: Update to 1.22.89. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 18:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54798@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 54798-submit@debbugs.gnu.org id=B54798.164944308015386 (code B ref 54798); Fri, 08 Apr 2022 18:38:03 +0000 Received: (at 54798) by debbugs.gnu.org; 8 Apr 2022 18:38:00 +0000 Received: from localhost ([127.0.0.1]:35956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nctUe-000405-4i for submit@debbugs.gnu.org; Fri, 08 Apr 2022 14:38:00 -0400 Received: from mout01.posteo.de ([185.67.36.65]:47677) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nctUY-0003zA-7a for 54798@debbugs.gnu.org; Fri, 08 Apr 2022 14:37:58 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 9960C240026 for <54798@debbugs.gnu.org>; Fri, 8 Apr 2022 20:37:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1649443068; bh=/HnQnZYVAAJa+jFafsdh/gRdnG+WkOn2JQV7hiDHvKU=; h=From:To:Cc:Subject:Date:From; b=n7YfwWkN0YopSuVTtW1tNDnLKQTtw0DYY7dhwyrcrcAdUcUJpQcXeJ0/EhrB9hghz CnmlGgJ3xaWJpdiNielKz7f9C8vh0dR2MQrLGCj8uacG+/kRGDa9QdWT4op2oKE1EI gQui7lUdS198VJQJnnn94+hgfsTgKkcaqI2QiTxqOBptdA1j+3UeVZpdapNedrSxcY VfF8Fw8HhRN61VPYbfZQuCkBhlL0n0IIvHzEonWyNWVNfyczONiEonJIORClCkNqL9 nB0Uq7GapzxcehWHsf9LsF435p4mhp4aKuu98VThqtXprEXD2ojQlgMJ4a5goGQNJV az4srCY8k6wqQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4KZn7014JXz6tmL; Fri, 8 Apr 2022 20:37:48 +0200 (CEST) From: Felix Gruber Date: Fri, 8 Apr 2022 18:37:20 +0000 Message-Id: <20220408183721.10948-4-felgru@posteo.net> In-Reply-To: <20220408183335.10473-1-felgru@posteo.net> References: <20220408183335.10473-1-felgru@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 * gnu/packages/python-web.scm (awscli): Update to 1.22.89. [source]: Add patch for compatibility with pyyaml 6.0. * gnu/packages/patches/awscli-support-pyyaml-6.0.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../patches/awscli-support-pyyaml-6.0.patch | 38 +++++++++++++++++++ gnu/packages/python-web.scm | 5 ++- 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/awscli-support-pyyaml-6.0.patch diff --git a/gnu/local.mk b/gnu/local.mk index a44815bdbb..d196764763 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -887,6 +887,7 @@ dist_patch_DATA = \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/awesome-4.3-fno-common.patch \ %D%/packages/patches/aws-c-auth-install-private-headers.patch \ + %D%/packages/patches/awscli-support-pyyaml-6.0.patch \ %D%/packages/patches/azr3.patch \ %D%/packages/patches/bash-completion-directories.patch \ %D%/packages/patches/bash-linux-pgrp-pipe.patch \ diff --git a/gnu/packages/patches/awscli-support-pyyaml-6.0.patch b/gnu/packages/patches/awscli-support-pyyaml-6.0.patch new file mode 100644 index 0000000000..a7bb377ba2 --- /dev/null +++ b/gnu/packages/patches/awscli-support-pyyaml-6.0.patch @@ -0,0 +1,38 @@ +From ae78bf3a052a06e9433351509baa06bc09c2680f Mon Sep 17 00:00:00 2001 +From: Cyrille +Date: Mon, 10 Jan 2022 10:57:42 +0100 +Subject: [PATCH] Update supported PyYAML range. + +--- +Based on https://github.com/aws/aws-cli/pull/6648. + + setup.cfg | 2 +- + setup.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.cfg b/setup.cfg +index 59a2f81cc8..0db2418d67 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -6,7 +6,7 @@ requires_dist = + botocore==1.24.34 + docutils>=0.10,<0.16 + s3transfer>=0.5.0,<0.6.0 +- PyYAML>=3.10,<5.5 ++ PyYAML>=3.10,<6.1 + colorama>=0.2.5,<0.4.4 + rsa>=3.1.2,<4.8 + +diff --git a/setup.py b/setup.py +index 937e34c075..2925b251ce 100644 +--- a/setup.py ++++ b/setup.py +@@ -27,7 +27,7 @@ def find_version(*file_paths): + 'botocore==1.24.34', + 'docutils>=0.10,<0.16', + 's3transfer>=0.5.0,<0.6.0', +- 'PyYAML>=3.10,<5.5', ++ 'PyYAML>=3.10,<6.1', + 'colorama>=0.2.5,<0.4.4', + 'rsa>=3.1.2,<4.8', + ] diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f77d163833..a017e04659 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2858,14 +2858,15 @@ supports url redirection and retries, and also gzip and deflate decoding.") (package ;; Note: updating awscli typically requires updating botocore as well. (name "awscli") - (version "1.21.11") + (version "1.22.89") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "0fkivwbx4nind5b7l4jhqm5bb9drgqsclcslrg4aggf9rcs4g4s0")))) + "0sarg9dbgwg29b8x3cwp54y3kwmv5kjx1wga46c9rwi4f6xi9m2a")) + (patches (search-patches "awscli-support-pyyaml-6.0.patch")))) (build-system python-build-system) (arguments ;; FIXME: The 'pypi' release does not contain tests.