From c566275595e97e978c41dc840db22df6df65e1d2 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Tue, 28 Oct 2025 22:49:11 +0000
Subject: [PATCH] gnu: awscli: Update to 1.42.61.

* gnu/packages/python-crypto.scm (python-rsa-for-awscli-1): New variable.

* gnu/packages/python-web.scm (awscli): Update to 1.42.61.
[arguments] <tests>: Reduce amount of tests, run just unit tests. Limit
threads count up to 8 to persist tests stability in CI.
[inputs]: Remove python-docutils-0.16 and python-rsa; add
python-docutils-0.19 and python-rsa-for-awscli-1.

Fixes: guix/guix#3920
Change-Id: Idfe0f7eb17b816654018dea335169ed20aa53980
---
 gnu/packages/python-crypto.scm | 14 ++++++++++++++
 gnu/packages/python-web.scm    | 31 ++++++++++++++-----------------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 63b25bd913b11b4213d1653179663be6c17fb159..2f78c1faa5608bc499fd215682060469dd1276cb 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -1261,6 +1261,20 @@ generation according to PKCS#1 version 1.5.  It can be used as a Python
 library as well as on the command line.")
    (license license:asl2.0)))
 
+(define-public python-rsa-for-awscli-1
+  (hidden-package
+   (package
+     (inherit python-rsa)
+     (version "3.4.2")
+     (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "rsa" version))
+        (sha256
+         (base32 "1dcxvszbikgzh99ybdc7jq0zb9wspy2ds8z9mjsqiyv3q884xpr5"))))
+     (native-inputs
+      (list python-setuptools)))))
+
 (define-public python-scrypt
   (package
     (name "python-scrypt")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d4466343e0d85bb1f196239cd0f9a9199c41db54..2bd61c846069153e82c4ef8b74f9e2aed04193e3 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6793,32 +6793,29 @@ opt.override_default_trust_store_from_path(None, os.getenv('SSL_CERT_FILE')) if
   (package
     ;; Note: updating awscli typically requires updating botocore as well.
     (name "awscli")
-    (version "1.36.32")
+    (version "1.42.61")
     (source
      (origin
-       (method git-fetch)               ; no tests in PyPI release
+       (method git-fetch)
        (uri (git-reference
              (url "https://github.com/aws/aws-cli")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1b4bfv7mgrxw7nfbv9ag97qcsqch2p7raip6111rqg5vdhvsck19"))))
+        (base32 "1fbqh4w7jj5abn87nbhyir25hdviirj0lblcdsqqkadcjh67877h"))))
     (build-system pyproject-build-system)
     (arguments
      (list
+      ;; tests: 2692 passed, 40 warnings 
       #:test-flags
-      #~(list "--numprocesses" (number->string (parallel-job-count))
-              ;; Tests require networking.
-              "--ignore" "tests/integration"
-              ;; It struggles to set PYTHONPATH.
-              ;;
-              ;; AssertionError: 'argument operation: Invalid choice, valid
-              ;; choices are:' not found in '
-              "-k"
-              (string-append "not test_subscribe_to_shard_removed"
-                             " and not test_start_conversation_removed"
-                             ;; Tests fail during mocking.
-                             " and not test_no_groff_or_mandoc_exists"))
+      #~(list "--numprocesses" (number->string (min 8 (parallel-job-count)))
+              ;; Compete test suite is huge and compute hungry, run just unit
+              ;; tests.
+              "--ignore=tests/dependencies"
+              "--ignore=tests/functional"
+              "--ignore=tests/integration"
+              ;; TypeError: 'Mock' object is not subscriptable.
+              "-k" "not test_no_groff_or_mandoc_exists")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'fix-reference-to-groff
@@ -6845,9 +6842,9 @@ opt.override_default_trust_store_from_path(None, os.getenv('SSL_CERT_FILE')) if
      (list groff-minimal
            python-botocore
            python-colorama
-           python-docutils-0.16
+           python-docutils-0.19
            python-pyyaml
-           python-rsa
+           python-rsa-for-awscli-1
            python-s3transfer))
     (home-page "https://aws.amazon.com/cli/")
     (synopsis "Command line client for AWS")