From patchwork Wed Nov 13 17:16:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 70375 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 870B627BBE9; Wed, 13 Nov 2024 17:34:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 9D61627BBE2 for ; Wed, 13 Nov 2024 17:34:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tBHFr-0008Fk-Im; Wed, 13 Nov 2024 12:34:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tBHFo-0008EY-QN for guix-patches@gnu.org; Wed, 13 Nov 2024 12:34:08 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tBHFn-0005XU-Cp; Wed, 13 Nov 2024 12:34:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=SJ5UkyG6qm55wBQBJ59nF0Vap0TQJAegaJloD4Qqrfo=; b=BN4jm+ZlcIqOB7ky3jiHrAh3ftNy4fE/TTdciOPruejnjzMvtvDJ6QQHhnOVTEg0JCDRsJiIs/BYhKzCqYEj7Mkjq7PZlpJrGRwF3qhF9ZnfIwiw57fibjhz+y7fnrI5DKbskM7UaB78YWyGS3bzvlEuN4TNmzkeg0dQHQJouQOGlphYKDyLpCGKzm2iCqlUP69J6wAdeUcB2Tn9SqTPU64YJUf91vdMNMvg9QOUlswt2SuaucvCG+rxEJiVYB3LC3bcsnoeKIWXkfbh/n80FmuJOlxuqWJmKBgjPM21soRfhvsNT8OwDDuKFUoFtXirr816+NbcDqVnQxLSsWlFvg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tBHFi-0001uj-UV; Wed, 13 Nov 2024 12:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74345] [PATCH 9/9] gnu: Add awscli-2. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Wed, 13 Nov 2024 17:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74345 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 74345@debbugs.gnu.org Cc: Ricardo Wurmus , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by 74345-submit@debbugs.gnu.org id=B74345.17315191917277 (code B ref 74345); Wed, 13 Nov 2024 17:34:02 +0000 Received: (at 74345) by debbugs.gnu.org; 13 Nov 2024 17:33:11 +0000 Received: from localhost ([127.0.0.1]:43465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBHEs-0001tE-F0 for submit@debbugs.gnu.org; Wed, 13 Nov 2024 12:33:10 -0500 Received: from sender4-of-o52.zoho.com ([136.143.188.52]:21230) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBHEq-0001t3-U9 for 74345@debbugs.gnu.org; Wed, 13 Nov 2024 12:33:09 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1731519186; cv=none; d=zohomail.com; s=zohoarc; b=P0NAkjllC8mQAtyVs/IfPdxu4SB109qPL+KB1kVKOTtqZ+PwukEOCztT7ESet4bfR3yXOJjD6jiTdQ4E0PgRBck2Y0FcpZSS9JFP7wPVriGwON6zsGlv5c8DVSFhFnnXdpoCrqcWi47gPliQl1lsyD23pPYIvyUuDKSdIfbUrVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731519186; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=SJ5UkyG6qm55wBQBJ59nF0Vap0TQJAegaJloD4Qqrfo=; b=k+wClSUwt94tT5SPw7MyGYOXJpEfN66qJtykx64Vthq+WdqI9YDjDdyDIznugpvKECeKgazrJdMXuqWxheQX8NlO7fCPaO529rLhdEjacmfgTxHskRORh2K16DzyvNP3t94hFSSA5ThnTuoDta14t99F9iNaO+3+e994jzInsj4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1731519186; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=SJ5UkyG6qm55wBQBJ59nF0Vap0TQJAegaJloD4Qqrfo=; b=IbV49M9nlQvXsR5LYSrd29SuXSkxNUTDW5PjMmP6PafPkKs0V1cs4nXmFEDQHf4R UITqcvzYNPsI1Nfy9K0W76TlaAsuYXc0gY3bu/yYTY3ogq9UKhY9olLaD8g4/hp7HuH Bm0YErOo11FcnSx6QhECRp0LDYKNuSoVtwObXBQc= Received: by mx.zohomail.com with SMTPS id 173151822094642.11312740352412; Wed, 13 Nov 2024 09:17:00 -0800 (PST) From: Ricardo Wurmus Date: Wed, 13 Nov 2024 18:16:22 +0100 Message-ID: <6db2775f552feaa2b9d2813d44d6cd70d41e7d0a.1731518182.git.rekado@elephly.net> X-Mailer: git-send-email 2.46.0 In-Reply-To: <1c21604f8e3f1bc9784e17f32c140da3c746d0a8.1731518182.git.rekado@elephly.net> References: <1c21604f8e3f1bc9784e17f32c140da3c746d0a8.1731518182.git.rekado@elephly.net> MIME-Version: 1.0 X-ZohoMailClient: External 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-web.scm (awscli-2): Rename to... (awscliv2): ...this new variable. (awscli-2): New variable. Change-Id: I24158ab8125d1fec15370841334bf089f0bf7978 --- 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 4000fdfcdd7..9127444d62f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4257,9 +4257,78 @@ (define-public awscli Amazon Web 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")