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

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

[Felix Gruber]

This patch series updates python-jmespath and makes sure that all
packages depending on it still build after that update.

Felix Gruber (5):
  gnu: python-jmespath: Update to 1.0.0.
  gnu: python-botocore: Update to 1.24.34.
  gnu: python-boto3: Update to 1.21.34.
  gnu: awscli: Update to 1.22.89.
  gnu: python-moto: Update to 3.1.4.

 gnu/local.mk                                  |  1 +
 .../patches/awscli-support-pyyaml-6.0.patch   | 38 +++++++++++++++++++
 gnu/packages/python-web.scm                   |  5 ++-
 gnu/packages/python-xyz.scm                   | 20 ++++++----
 4 files changed, 54 insertions(+), 10 deletions(-)
 create mode 100644 gnu/packages/patches/awscli-support-pyyaml-6.0.patch

-- 
2.30.2

[bug#54798] [PATCH 1/5] gnu: python-jmespath: Update to 1.0.0.

[Felix Gruber]

* gnu/packages/python-xyz.scm (python-jmespath): Update to 1.0.0.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 55705ab2ea..5493d02bc9 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14398,14 +14398,14 @@ servers.")
 (define-public python-jmespath
   (package
    (name "python-jmespath")
-   (version "0.9.4")
+   (version "1.0.0")
    (source
     (origin
      (method url-fetch)
      (uri (pypi-uri "jmespath" version))
      (sha256
       (base32
-       "0k0765x1mybcrzajh3hiqkl8sy9hs0bmn4900frxy0j3ykvaxqmx"))))
+       "0pmzfi230zfgiq2rz896kbb9f7mp0lnrjdl6x1npvxfixn0f5454"))))
    (build-system python-build-system)
    (native-inputs
     (list python-nose))
-- 
2.30.2

[bug#54798] [PATCH 2/5] gnu: python-botocore: Update to 1.24.34.

[Felix Gruber]

* gnu/packages/python-xyz.scm (python-botocore): Update to 1.24.34.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5493d02bc9..3e6c65868a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14548,14 +14548,14 @@ This software is unmaintained, and new projects should use @code{boto3} instead.
   ;; are compatible.
   (package
     (name "python-botocore")
-    (version "1.22.11")
+    (version "1.24.34")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "botocore" version))
        (sha256
         (base32
-         "1z7g2scyzvfq4yj9b4w911k7802ry1v6lqfnwq12l0ak7ywmsvrh"))))
+         "0m9mv5xsnnj6lf0m8zpb6b6mcf6m6jp9slsjdjn0873rlrj9i17c"))))
     (build-system python-build-system)
     (arguments
      ;; FIXME: Many tests are failing.
-- 
2.30.2

[bug#54798] [PATCH 3/5] gnu: python-boto3: Update to 1.21.34.

[Felix Gruber]

* gnu/packages/python-xyz.scm (python-boto3): Update to 1.21.34.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3e6c65868a..2ebb6a16de 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14574,7 +14574,7 @@ interface to the Amazon Web Services (AWS) API.")
 (define-public python-boto3
   (package
     (name "python-boto3")
-    (version "1.19.11")
+    (version "1.21.34")
     (home-page "https://github.com/boto/boto3")
     (source (origin
               (method git-fetch)
@@ -14582,7 +14582,7 @@ interface to the Amazon Web Services (AWS) API.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1wv0ci2z5ywvm63dh4mp64vqyyvkm4qxc8dxv8ncrqiiphpgr9aq"))))
+                "17gpyfifzwydz9h8gw7knhwdps3bcyvn8j7vsijms4qh8n77v383"))))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-- 
2.30.2

[bug#54798] [PATCH 4/5] gnu: awscli: Update to 1.22.89.

[Felix Gruber]

* 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@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

[bug#54798] [PATCH 5/5] gnu: python-moto: Update to 3.1.4.

[Felix Gruber]

* gnu/packages/python-xyz.scm (python-moto): Update to 3.1.4.
[propagated-inputs]: Add python-graphql-core.
[arguments]: Disable two new failing tests.
---
 gnu/packages/python-xyz.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 2ebb6a16de..74cd67a4f0 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14166,13 +14166,13 @@ text.")
 (define-public python-moto
   (package
     (name "python-moto")
-    (version "2.2.12")
+    (version "3.1.4")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "moto" version))
               (sha256
                (base32
-                "0pvay0jp119lzzwf5qj5h6311271yq0w2i6344ds20grpf6g6gz8"))))
+                "0dfnad1f9d5ybabs69dzc7x357z1r4jbhrhgw57gyic1qnmcw864"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -14192,9 +14192,12 @@ text.")
                         ;; XXX: This test is timing sensitive and may
                         ;; fail non-deterministically.
                         "not test_cancel_pending_job"
+                        ;; XXX: Not sure why the following test fails.
+                        " and not test_create_custom_lambda_resource__verify_cfnresponse_failed"
                         ;; These tests require Docker.
                         " and not test_terminate_job"
                         " and not test_invoke_function_from_sqs_exception"
+                        " and not test_lambda_function"
                         " and not test_rotate_secret_lambda_invocations"
                         ;; These tests also require the network.
                         " and not test_put_record_batch_http_destination"
@@ -14220,6 +14223,7 @@ text.")
            python-cryptography
            python-dateutil
            python-docker
+           python-graphql-core
            python-idna
            python-jinja2
            python-jose
-- 
2.30.2

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

[Ludovic Courtès]

Hi Felix,

Felix Gruber <felgru@posteo.net> skribis:

> This patch series updates python-jmespath and makes sure that all
> packages depending on it still build after that update.
>
> Felix Gruber (5):
>   gnu: python-jmespath: Update to 1.0.0.
>   gnu: python-botocore: Update to 1.24.34.
>   gnu: python-boto3: Update to 1.21.34.
>   gnu: awscli: Update to 1.22.89.
>   gnu: python-moto: Update to 3.1.4.

I have some bad news: it seems a few things changed recently (there was
an update of python-botocore that’s redundant with this one), and I
cannot get ‘awscli’ to build.

Could you try to rebase this series and send updated patch?

I’ll quickly apply it before someone comes and breaks it all.  :-)

Ludo’.

[bug#54798] [PATCH v2 0/4] Update python-jmespath to 1.0.0.

[Felix Gruber]

Hi Ludo’,

On 4/15/22 19:04, Ludovic Courtès wrote:
> I have some bad news: it seems a few things changed recently (there was
> an update of python-botocore that’s redundant with this one), and I
> cannot get ‘awscli’ to build.
> 
> Could you try to rebase this series and send updated patch?
> 
> I’ll quickly apply it before someone comes and breaks it all.  :-)

Thanks for letting me know. awscli is quite picky about the version of
botocore that it wants. It seems that awscli always pins its
dependencies to the latest botocore release. I've thus changed my patch
to package awscli 1.22.90 instead of 1.22.89, to be compatible with our
current version of python-botocore.

Kind regards,
Felix

Felix Gruber (4):
  gnu: python-jmespath: Update to 1.0.0.
  gnu: awscli: Update to 1.22.90.
  gnu: Remove python-botocore-for-awscli.
  gnu: Remove python-pyyaml-for-awscli.

 gnu/packages/python-web.scm |  6 +++---
 gnu/packages/python-xyz.scm | 30 ++----------------------------
 2 files changed, 5 insertions(+), 31 deletions(-)

-- 
2.35.1

[bug#54798] [PATCH v2 1/4] gnu: python-jmespath: Update to 1.0.0.

[Felix Gruber]

* gnu/packages/python-xyz.scm (python-jmespath): Update to 1.0.0.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 219a0d9213..101204a5d5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14491,14 +14491,14 @@ (define-public python-tox
 (define-public python-jmespath
   (package
    (name "python-jmespath")
-   (version "0.9.4")
+   (version "1.0.0")
    (source
     (origin
      (method url-fetch)
      (uri (pypi-uri "jmespath" version))
      (sha256
       (base32
-       "0k0765x1mybcrzajh3hiqkl8sy9hs0bmn4900frxy0j3ykvaxqmx"))))
+       "0pmzfi230zfgiq2rz896kbb9f7mp0lnrjdl6x1npvxfixn0f5454"))))
    (build-system python-build-system)
    (native-inputs
     (list python-nose))
-- 
2.35.1

[bug#54798] [PATCH v2 2/4] gnu: awscli: Update to 1.22.90.

[Felix Gruber]

* gnu/packages/python-web.scm (awscli): Update to 1.22.90.
[inputs]: Replace python-botocore-for-awscli with python-botocore.
---
 gnu/packages/python-web.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 28c934e896..b048778932 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2870,14 +2870,14 @@ (define-public awscli
   (package
     ;; Note: updating awscli typically requires updating botocore as well.
     (name "awscli")
-    (version "1.21.11")
+    (version "1.22.90")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri name version))
        (sha256
         (base32
-         "0fkivwbx4nind5b7l4jhqm5bb9drgqsclcslrg4aggf9rcs4g4s0"))))
+         "0ky4ax4xh7s8w1l0hwc7w9ii8afvh9nib3kz09qhiqdinxzrlv54"))))
     (build-system python-build-system)
     (arguments
      ;; FIXME: The 'pypi' release does not contain tests.
@@ -2899,7 +2899,7 @@ (define-public awscli
                 (string-append "cmdline = ['" (which "groff") "'"))))))))
     (inputs
      (list python-colorama-for-awscli
-           python-botocore-for-awscli
+           python-botocore
            python-s3transfer
            python-docutils-0.15
            python-pyyaml
-- 
2.35.1

[bug#54798] [PATCH v2 2/4] gnu: awscli: Update to 1.22.90.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

Felix Gruber schreef op zo 17-04-2022 om 20:04 [+0000]:
                 (string-append "cmdline = ['" (which "groff") "'"))))))))

While this was present in the original code, awscli-1.21.11 keeps a reference
to groff-1.22.4 and this appears to be a runtime thing, so I think
(which "groff") needs to be (search-input-file inputs "bin/groff") and groff
needs to be moved to 'inputs' instead of 'native-inputs' for cross-compilation
reasons.  python-build-system doesn't support cross-compilation yet but
possibly someday it will ...

Greetings,
Maxime

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54798] [PATCH v3 2/4] gnu: awscli: Update to 1.22.90.

[Felix Gruber]

* gnu/packages/python-web.scm (awscli): Update to 1.22.90.
[arguments] Use search-input-file to find groff.
[inputs]: Replace python-botocore-for-awscli with python-botocore.
Add groff.
[native-inputs]: Remove groff.
---
 gnu/packages/python-web.scm | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 28c934e896..5fcfd27914 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2870,14 +2870,14 @@ (define-public awscli
   (package
     ;; Note: updating awscli typically requires updating botocore as well.
     (name "awscli")
-    (version "1.21.11")
+    (version "1.22.90")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri name version))
        (sha256
         (base32
-         "0fkivwbx4nind5b7l4jhqm5bb9drgqsclcslrg4aggf9rcs4g4s0"))))
+         "0ky4ax4xh7s8w1l0hwc7w9ii8afvh9nib3kz09qhiqdinxzrlv54"))))
     (build-system python-build-system)
     (arguments
      ;; FIXME: The 'pypi' release does not contain tests.
@@ -2891,21 +2891,22 @@ (define-public awscli
                             "setup.py")
                (("<5.5") "<=6"))))
          (add-after 'unpack 'fix-reference-to-groff
-           (lambda _
+           (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "awscli/help.py"
                (("if not self._exists_on_path\\('groff'\\):") "")
                (("raise ExecutableNotFoundError\\('groff'\\)") "")
                (("cmdline = \\['groff'")
-                (string-append "cmdline = ['" (which "groff") "'"))))))))
+                (string-append "cmdline = ['"
+                               (search-input-file inputs "bin/groff")
+                               "'"))))))))
     (inputs
-     (list python-colorama-for-awscli
-           python-botocore-for-awscli
+     (list groff
+           python-colorama-for-awscli
+           python-botocore
            python-s3transfer
            python-docutils-0.15
            python-pyyaml
            python-rsa))
-    (native-inputs
-     (list groff))
     (home-page "https://aws.amazon.com/cli/")
     (synopsis "Command line client for AWS")
     (description "AWS CLI provides a unified command line interface to the
-- 
2.35.1

[bug#54798] [PATCH v2 3/4] gnu: Remove python-botocore-for-awscli.

[Felix Gruber]

* gnu/packages/python-xyz.scm (python-botocore-for-awscli): Remove
  variable.
---
 gnu/packages/python-xyz.scm | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 101204a5d5..ad4e05bb0d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14664,20 +14664,6 @@ (define-public python-botocore
 (define-public python2-botocore
   (package-with-python2 python-botocore))
 
-(define-public python-botocore-for-awscli
-  ;; Note: When updating botocore, also make sure that boto3 and awscli
-  ;; are compatible.
-  (package
-    (inherit python-botocore)
-    (version "1.22.11")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "botocore" version))
-       (sha256
-        (base32
-         "1z7g2scyzvfq4yj9b4w911k7802ry1v6lqfnwq12l0ak7ywmsvrh"))))))
-
 (define-public python-boto3
   (package
     (name "python-boto3")
-- 
2.35.1

[bug#54798] [PATCH v2 4/4] gnu: Remove python-pyyaml-for-awscli.

[Felix Gruber]

* gnu/packages/python-xyz.scm (python-pyyaml-for-awscli): Remove
  variable.
---
 gnu/packages/python-xyz.scm | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ad4e05bb0d..7193d4e6ce 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3941,18 +3941,6 @@ (define-public python2-pyyaml
           (base32
            "0pm440pmpvgv5rbbnm8hk4qga5a292kvlm1bh3x2nwr8pb5p8xv0")))))))
 
-(define-public python-pyyaml-for-awscli
-  (package
-    (inherit python-pyyaml)
-    (version "5.4.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "PyYAML" version))
-       (sha256
-        (base32
-         "0pm440pmpvgv5rbbnm8hk4qga5a292kvlm1bh3x2nwr8pb5p8xv0"))))))
-
 (define-public python-vine
   (package
     (name "python-vine")
-- 
2.35.1

bug#54798: [PATCH v2 0/4] Update python-jmespath to 1.0.0.

[Ludovic Courtès]

Hi Felix,

Felix Gruber <felgru@posteo.net> skribis:

> Thanks for letting me know. awscli is quite picky about the version of
> botocore that it wants. It seems that awscli always pins its
> dependencies to the latest botocore release. I've thus changed my patch
> to package awscli 1.22.90 instead of 1.22.89, to be compatible with our
> current version of python-botocore.

Great.

> Felix Gruber (4):
>   gnu: python-jmespath: Update to 1.0.0.
>   gnu: awscli: Update to 1.22.90.
>   gnu: Remove python-botocore-for-awscli.
>   gnu: Remove python-pyyaml-for-awscli.

Applied, thanks!  (I picked v3 for the second patch.)

Ludo’.

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

[zimoun]

[-- Attachment #1: Type: text/plain, Size: 107 bytes --]

Hi,

Please consider this

https://issues.guix.gnu.org/54934

Which also updates related packages.

Cheers

[-- Attachment #2: Type: text/html, Size: 255 bytes --]