From patchwork Thu Nov 14 11:52:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 70384 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 C42CF27BBEA; Thu, 14 Nov 2024 11:55:38 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,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=ham 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 456BF27BBE2 for ; Thu, 14 Nov 2024 11:55:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tBYRN-0006DX-PX; Thu, 14 Nov 2024 06:55:13 -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 1tBYRL-00069m-Aw for guix-patches@gnu.org; Thu, 14 Nov 2024 06:55:11 -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 1tBYRL-0005M5-1K; Thu, 14 Nov 2024 06:55:11 -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=tqAmfcuzJ4p4gnpZACi0g7zS+ggxd7y8nhri4yERnh4=; b=UhxkYiPli2g3n/0i5n4syxVMoGWXVO+6G1dSeYxtziFzTbuC2PoleDfbkJPja3DIsPmxtIAE+EYR5TytXbBC9akzk4A9i9bmdNI9bn3RUtxcHfwF8I5EQT33Gz8G8vMM23n5kIM5IvdxgR55iajzJqV60xPYzK+mVyqWWE8YWu8h/OpqCfw9eK/7LOdykLSvK7JFylTNcj6aQLSFVmSR0IkpxJB+7eQ26wE7M77KDhUR0UtlEKKu4QHhZfxSixH3Od0ReNm9lyhx2BqNtRIKqbtlVNtzisPrh4oIi0tnbOyGttoYD0iHWgGV9u7pzTChHZ5WYAFG3BNc52b7Ks9u2Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tBYRK-0002VO-6D; Thu, 14 Nov 2024 06:55:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74345] [PATCH v2 14/14] gnu: Add awscli-2. Resent-From: Sharlatan Hellseher 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: Thu, 14 Nov 2024 11:55:10 +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.17315852699399 (code B ref 74345); Thu, 14 Nov 2024 11:55:10 +0000 Received: (at 74345) by debbugs.gnu.org; 14 Nov 2024 11:54:29 +0000 Received: from localhost ([127.0.0.1]:45380 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBYQf-0002RR-16 for submit@debbugs.gnu.org; Thu, 14 Nov 2024 06:54:29 -0500 Received: from mail-wr1-f49.google.com ([209.85.221.49]:46093) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBYQS-0002PJ-7i for 74345@debbugs.gnu.org; Thu, 14 Nov 2024 06:54:17 -0500 Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-37d63a79bb6so398075f8f.0 for <74345@debbugs.gnu.org>; Thu, 14 Nov 2024 03:54:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731585190; x=1732189990; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tqAmfcuzJ4p4gnpZACi0g7zS+ggxd7y8nhri4yERnh4=; b=HX1r33YjkoFrv5768+mJQpKjhekh5+2Kha9jGZ/b5eH0DZt1Bb9o4G5hOSgNxwqYFE Xipjcw29sqP4ZXVbCRaKD8anp6KL0Z6MvSz2U/nX0efrghGwauotfWuIWa8i6fYEG7pJ nUDGHsEsxxykNoUYbcMynHf8vTMt6l4nK4M9WySaySqvr+AEL8FJI41MxiUtH1xkI2gf fZc3aIUZTK+tMauLdaOJ/Vr/4ovxc5g+6v2X3I/HpOVmeK1Y+z5TkV7jX+RO6Py4Kqy/ idKKu6HEB7t5Me2asuKyQntK1mtemjLDaGMml92BEzARjV0Qs2Hm0y5oSmpGIRabpxE4 R3yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731585190; x=1732189990; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tqAmfcuzJ4p4gnpZACi0g7zS+ggxd7y8nhri4yERnh4=; b=DemuqVEyf9V2sJ7B2fk5UoVNHxewESm8/CZlSwjg077mTK5uU446Fj4u8AcegbucdR iV+SkxjwHj6akovBVDLwvrM//OuR/TCWA01PQfrhtEs5dR820ZLH63xumlHdcc06GoYB G5lgnXNxvojhsQcQPZFsW3ofHBHbnjE9RyOnDEQN1kgnLNlV88YFehHpN93AYwbck1db r9fIJ9kSpIy61wSrsKK39718pUNAnVo4GXVQM2JMImBM6qjGIqyzgRqshjE3OWK3w1rv 5Qd3Iq+eHRi0I5HF/uzfdkVAM+7Sy3QWp8cV3dkf4UIA1LPEEUy29fT6QoVdIQ9uRlS4 aZYw== X-Gm-Message-State: AOJu0Yy6gnhSY7SjlI0CprTxW8a+i3d3k5t8oaoLMGMWin0yFICZ0RhU IpY8Ns7WUzBqkpmO+ZDKX2xeLcQKHuEXmbOttzZZhsNGh1iv/4LCGzYBKCpxwU4= X-Google-Smtp-Source: AGHT+IGyVrGTn1ym2pNf7xxL2YZRywxQS4ZbaSUzwDLmwOaWLlRxN2YnGLmxgmQBE1eFyjjMqPU5mA== X-Received: by 2002:a5d:6c6c:0:b0:37d:47b3:7b82 with SMTP id ffacd0b85a97d-3820df8cf28mr5015857f8f.57.1731585190437; Thu, 14 Nov 2024 03:53:10 -0800 (PST) Received: from guxtil.incerto.xyz (cpc100684-bagu15-2-0-cust967.1-3.cable.virginm.net. [86.8.111.200]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3821ae154c3sm1260537f8f.67.2024.11.14.03.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2024 03:53:10 -0800 (PST) From: Sharlatan Hellseher Date: Thu, 14 Nov 2024 11:52:55 +0000 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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 From: Ricardo Wurmus * 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")