unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Sharlatan Hellseher <sharlatanus@gmail.com>
To: 74345@debbugs.gnu.org
Cc: Ricardo Wurmus <rekado@elephly.net>,
	Lars-Dominik Braun <lars@6xq.net>, Marius Bakke <marius@gnu.org>,
	Munyoki Kilyungi <me@bonfacemunyoki.com>,
	Sharlatan Hellseher <sharlatanus@gmail.com>,
	Tanguy Le Carrour <tanguy@bioneland.org>,
	jgart <jgart@dismail.de>
Subject: [bug#74345] [PATCH v2 14/14] gnu: Add awscli-2.
Date: Thu, 14 Nov 2024 11:52:55 +0000	[thread overview]
Message-ID: <d0e6d2b80cc1461cc212951ebabaa8e44542c649.1731584861.git.sharlatanus@gmail.com> (raw)
In-Reply-To: <cover.1731584860.git.sharlatanus@gmail.com>

From: Ricardo Wurmus <rekado@elephly.net>

* gnu/packages/python-web.scm (awscli-2): Rename to...
(awscliv2): ...this new variable.
(awscli-2): New variable.

Change-Id: Id5c356ae0e6af53167d4acde7934f88c2f527a00
---
 gnu/packages/python-web.scm | 71 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d3ef984a07..bc18c282c6 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4285,9 +4285,78 @@ (define-public awscli
 Services (AWS) API.")
     (license license:asl2.0)))
 
+(define-public awscli-2
+  (package
+    (inherit awscli)
+    (name "awscli")
+    (version "2.20.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/aws/aws-cli")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0hyr9gmcfk7nzkgs0v6wgkh8k15dyhknqzfymbc9a9sa2dblc40q"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'ignore-deprecations
+            (lambda _
+              (substitute* "pyproject.toml"
+                (("\"error::") "\"ignore::"))))
+          (add-after 'unpack 'remove-pep517
+            (lambda _
+              (rename-file "backends/pep517.py" "backends/dummypep517.py")
+              (substitute* "pyproject.toml"
+                (("pep517") "dummypep517"))
+              (setenv "PYTHONPATH"
+                      (string-append (getcwd) ":"
+                                     (getcwd) "/backends:"
+                                     (getenv "GUIX_PYTHONPATH")))))
+          (add-after 'unpack 'fix-reference-to-groff
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "awscli/help.py"
+                (("if self._exists_on_path\\('groff'\\):") "if True:")
+                (("cmdline = \\['groff'")
+                 (string-append "cmdline = ['"
+                                (search-input-file inputs "bin/groff")
+                                "'")))))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (substitute* "scripts/ci/run-tests"
+                  (("--numprocesses=auto --dist=loadfile --maxprocesses=4") ""))
+                ;; For an unknown reason pytest receives SIGTERM and no tests
+                ;; are run..
+                #;
+                (invoke "python" "scripts/ci/run-tests")))))))
+    (inputs
+     (list groff
+           python-awscrt-for-awscli
+           python-colorama
+           python-botocore
+           python-cryptography
+           python-dateutil
+           python-docutils
+           python-jmespath
+           python-prompt-toolkit
+           python-ruamel.yaml-0.16
+           python-ruamel.yaml.clib
+           python-urllib3))
+    (native-inputs
+     (list python-distro
+           python-flit
+           python-pytest
+           python-wheel))))
+
 ;; This is not an official release of awscli version 2, so it should not be
 ;; named awscli.
-(define-public awscli-2
+(define-public awscliv2
   (package
     (inherit awscli)
     (name "awscliv2")
-- 
2.46.0





  parent reply	other threads:[~2024-11-14 11:55 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-13 16:53 [bug#74345] Update awscli Ricardo Wurmus
2024-11-13 17:16 ` [bug#74345] [PATCH 1/9] gnu: python-s3transfer: Update to 0.10.3 Ricardo Wurmus
2024-11-13 17:16   ` [bug#74345] [PATCH 2/9] gnu: python-botocore: Update to 1.35.59 Ricardo Wurmus
2024-11-13 18:48     ` Sharlatan Hellseher
2024-11-13 17:16   ` [bug#74345] [PATCH 3/9] gnu: python-boto3: " Ricardo Wurmus
2024-11-13 17:16   ` [bug#74345] [PATCH 4/9] gnu: awscli: Update to 1.36.0 Ricardo Wurmus
2024-11-13 17:16   ` [bug#74345] [PATCH 5/9] gnu: awscli-2: Add missing inputs Ricardo Wurmus
2024-11-13 17:16   ` [bug#74345] [PATCH 6/9] gnu: awscli-2: Update to 2.3.1 Ricardo Wurmus
2024-11-13 17:16   ` [bug#74345] [PATCH 7/9] gnu: Add python-awscrt Ricardo Wurmus
2024-11-13 17:16   ` [bug#74345] [PATCH 8/9] gnu: Add python-awscrt-for-awscli Ricardo Wurmus
2024-11-13 17:16   ` [bug#74345] [PATCH 9/9] gnu: Add awscli-2 Ricardo Wurmus
2024-11-13 20:37 ` [bug#74345] Update awscli Sharlatan Hellseher
2024-11-14  8:49   ` Ricardo Wurmus
2024-11-13 21:10 ` Vincent Legoll
2024-11-14 11:52 ` [bug#74345] [PATCH v2 00/14] " Sharlatan Hellseher
2024-11-14 11:52   ` [bug#74345] [PATCH v2 01/14] gnu: python-botocore: Update to 1.35.54 Sharlatan Hellseher
2024-11-14 11:52   ` [bug#74345] [PATCH v2 02/14] gnu: python-s3transfer: Update to 0.10.3 Sharlatan Hellseher
2024-11-14 11:52   ` [bug#74345] [PATCH v2 03/14] gnu: python-boto3: Update to 1.35.54 Sharlatan Hellseher
2024-11-14 11:52   ` [bug#74345] [PATCH v2 04/14] gnu: awscli: Update to 1.35.20 Sharlatan Hellseher
2024-11-14 11:52   ` [bug#74345] [PATCH v2 05/14] gnu: Remove python-boto Sharlatan Hellseher
2024-11-14 11:52   ` [bug#74345] [PATCH v2 06/14] gnu: Remove python-colorama-for-awscli Sharlatan Hellseher
2024-11-14 11:52   ` [bug#74345] [PATCH v2 07/14] gnu: python-botocore: Update to 1.35.59 Sharlatan Hellseher
2024-11-14 11:52   ` [bug#74345] [PATCH v2 08/14] gnu: python-boto3: " Sharlatan Hellseher
2024-11-14 11:52   ` [bug#74345] [PATCH v2 09/14] gnu: awscli: Update to 1.36.0 Sharlatan Hellseher
2024-11-14 11:52   ` [bug#74345] [PATCH v2 10/14] gnu: awscli-2: Add missing inputs Sharlatan Hellseher
2024-11-14 11:52   ` [bug#74345] [PATCH v2 11/14] gnu: awscli-2: Update to 2.3.1 Sharlatan Hellseher
2024-11-14 11:52   ` [bug#74345] [PATCH v2 12/14] gnu: Add python-awscrt Sharlatan Hellseher
2024-11-14 11:52   ` [bug#74345] [PATCH v2 13/14] gnu: Add python-awscrt-for-awscli Sharlatan Hellseher
2024-11-14 11:52   ` Sharlatan Hellseher [this message]
2024-11-16 18:46 ` [bug#74345] Update awscli Sharlatan Hellseher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d0e6d2b80cc1461cc212951ebabaa8e44542c649.1731584861.git.sharlatanus@gmail.com \
    --to=sharlatanus@gmail.com \
    --cc=74345@debbugs.gnu.org \
    --cc=jgart@dismail.de \
    --cc=lars@6xq.net \
    --cc=marius@gnu.org \
    --cc=me@bonfacemunyoki.com \
    --cc=rekado@elephly.net \
    --cc=tanguy@bioneland.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).