GNU bug report logs - #54798
[PATCH 0/5] Update python-jmespath to 1.0.0.

Previous Next

Full log

View this message in rfc822 format

From: Felix Gruber <felgru <at> posteo.net>
To: 54798 <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [bug#54798] [PATCH 4/5] gnu: awscli: Update to 1.22.89.
Date: Fri,  8 Apr 2022 18:37:20 +0000

* 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 <cyrille <at> bayesimpact.org>
+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.
-- 
2.30.2

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.