From patchwork Thu Nov 14 11:52:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 70391 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 AC67527BBEA; Thu, 14 Nov 2024 11:56:02 +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 0960827BBE2 for ; Thu, 14 Nov 2024 11:56:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tBYRL-00069W-5i; Thu, 14 Nov 2024 06:55: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 1tBYRJ-000685-Ji for guix-patches@gnu.org; Thu, 14 Nov 2024 06:55:09 -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 1tBYRJ-0005LR-9d; Thu, 14 Nov 2024 06:55:09 -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=pUXjNCdW+1U7WUujgNSGH/wLcuPMurPB6h8D8N/K1zc=; b=WoEmcZi9ShNYyAg+jEayzzEUpW4OgEAK3sAKWhprPSY/xEOPO1Y4qj7+IwZIiiFjCkKCtK6bySVW7gqMCdXGoqB0BLrvOlzVXnPsX7qzyOJbk92+Erf9zVd5wPXucCjOVys8e617yJBtU/7NbJRW2bW3KEFcc7ctY/GP0/xq8FA64TGuoQ2oGLZIPm0PFP21xMLLyq7gJ1mhCMv7fvYPvPDmfRGWNi3G+Ewbafu6PXWzbq0Ovbw3ENrVI61jTDLR/CWsVunwoTxhup001h87cx1KLm4Jv6tpQHk+A9U5qd2BDV4WFbi/yGEpD8vNGaABKStoA98aiDUTAojI41j0Ag==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tBYRF-0002Tk-Ll; Thu, 14 Nov 2024 06:55:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74345] [PATCH v2 04/14] gnu: awscli: Update to 1.35.20. 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:05 +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: Sharlatan Hellseher , 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.17315852549317 (code B ref 74345); Thu, 14 Nov 2024 11:55:05 +0000 Received: (at 74345) by debbugs.gnu.org; 14 Nov 2024 11:54:14 +0000 Received: from localhost ([127.0.0.1]:45359 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBYQO-0002Pq-TM for submit@debbugs.gnu.org; Thu, 14 Nov 2024 06:54:13 -0500 Received: from mail-wr1-f53.google.com ([209.85.221.53]:61781) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBYQK-0002O6-MK for 74345@debbugs.gnu.org; Thu, 14 Nov 2024 06:54:09 -0500 Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-382185ed80eso349880f8f.3 for <74345@debbugs.gnu.org>; Thu, 14 Nov 2024 03:54:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731585183; x=1732189983; 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=pUXjNCdW+1U7WUujgNSGH/wLcuPMurPB6h8D8N/K1zc=; b=akXmm5GEKGS3gTYWrrOEefmwIXUjvweTUJZ+WRippxgSZMglVdStBvHXgxQqBY/ynm i0qqetcn8+XzrQVU3CQCMmjVk3MPUFSSEV9qxC5pH7SsyW5wt3wrwxjaqNwbohMJkE6p VTuiyx0wxO0RHkD/dCtFGSjSUmoyfpKMS38DBW280R8xPcD94gbdwCJD06wprETk0WTC hfkpuTUA732SBH8OS4kjVH4UmX+e+r7+pXsNIpI2b+bwimJrDB0YSoZ8ehf7nv/45HQO js3XQLqOu9uxuvB3jm5U7FhnfkqcpREaIO066mkPQYJy50Kok7ACgSuL3KOAWnI/Fo9g 1mbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731585183; x=1732189983; 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=pUXjNCdW+1U7WUujgNSGH/wLcuPMurPB6h8D8N/K1zc=; b=imrpv2qug5E4gBTaC7EME2cnJhZPD1YSgGEXqLadVycEv2GdkCc59U7qWWjDcJ35Xw EHKtgHrHl1pXP6nL17dDbg3DHo1n9VdGWSZ9PXxLYJuvOU6XJ7M0PCQQdJjRADlyH95C MeZN5Cwx9PXNBfoQEnmzAy5cngvhbTR5QJaWOLf5nOtfLUVau/lmNjNzIQ98AtxwIwsW UUDdk37MRCF0atmblIAXdQJCa0mi3uOi5rgrANjmloi7iCfXbWNdYIii1gCErCVKUdsA mi32Kh5SVqsQN6tkNpIaKFXoFcyr6FEGB+i3p3xaTVxiiC6kYT+12oJkaf4hD0p9hldT otvg== X-Gm-Message-State: AOJu0Yz4NsMlV0uugYh57DTHl4gvlBlnVLezt/b6KfipucSecohvPPgE UB+9Y0sDWXwgiVEjDMlgGoyvEcbzw4MP6TogUFrVQhf5RK/2IBwmV+k2gdHa7KE= X-Google-Smtp-Source: AGHT+IFWGt9nAMhoC4Qu3wzDm9vIdDYXA52Y9YYBLhCHx4r5EvO8ACjAR8c+rvKiwGogD/jz8qWvug== X-Received: by 2002:a05:6000:1883:b0:37c:cfba:d16b with SMTP id ffacd0b85a97d-381f1885763mr21358346f8f.44.1731585182869; Thu, 14 Nov 2024 03:53:02 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2024 03:53:02 -0800 (PST) From: Sharlatan Hellseher Date: Thu, 14 Nov 2024 11:52:45 +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 * gnu/packages/python-web.scm (awscli): Update to 1.35.20. Use G-expressions. [source]: Swap to git checkout as it contains tests. [build-system]: Swap to pyproject-build-system. [phases]: Delete use-recent-pyyaml phase; add set-invorenment phase. [inputs]: Remove groff, python-colorama-for-awscli, and python-pyyaml-5; add groff-minimal, python-colorama, and python-pyyaml. [native-inputs]: Add python-pytest, python-pytest-xdist, python-setuptools, and python-wheel. Change-Id: Ib7542a783fe65bb93d9f4cbfb89241190813fde4 --- gnu/packages/python-web.scm | 81 ++++++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 32 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b18248e472..1421936eb6 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4136,47 +4136,64 @@ (define-public awscli (package ;; Note: updating awscli typically requires updating botocore as well. (name "awscli") - (version "1.22.90") + (version "1.35.20") (source (origin - (method url-fetch) - (uri (pypi-uri name version)) + (method git-fetch) ; no tests in PyPI release + (uri (git-reference + (url "https://github.com/aws/aws-cli") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0ky4ax4xh7s8w1l0hwc7w9ii8afvh9nib3kz09qhiqdinxzrlv54")))) - (build-system python-build-system) + (base32 "1hj1hj374hdwb8wq2xw20ywjyrv37s65nfsjzs6k9wa0f629alkf")))) + (build-system pyproject-build-system) (arguments - ;; FIXME: The 'pypi' release does not contain tests. - '(#:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'use-recent-pyyaml - (lambda _ - (substitute* '("awscli.egg-info/requires.txt" - "setup.cfg" - "setup.py") - (("<5.5") "<=6")))) - (add-after 'unpack 'fix-reference-to-groff - (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 = ['" - (search-input-file inputs "bin/groff") - "'")))))))) + (list + #:test-flags + #~(list "--numprocesses" "auto" + ;; Tests require networking. + "--ignore" "tests/integration" + ;; It strugles 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")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-reference-to-groff + (lambda _ + ;; XXX: Consider to use wrap-program instead, it tries to parse + ;; the PATH. + (substitute* "awscli/help.py" + (("if self._exists_on_path\\('groff'\\):") "if 'groff':") + (("raise ExecutableNotFoundError\\('groff'\\)") "") + (("cmdline = \\['groff'") + (format #f "cmdline = ['~a/bin/groff'" + #$(this-package-input "groff-minimal")))))) + (add-before 'check 'set-environment + (lambda _ + ;; PermissionError: [Errno 13] Permission denied: + ;; '/homeless-shelter' + (setenv "HOME" "/tmp")))))) + (native-inputs + (list python-pytest + python-pytest-xdist + python-setuptools + python-wheel)) (inputs - (list groff - python-colorama-for-awscli + (list groff-minimal python-botocore - python-s3transfer + python-colorama python-docutils-0.15 - python-pyyaml-5 - python-rsa)) + python-pyyaml + python-rsa + python-s3transfer)) (home-page "https://aws.amazon.com/cli/") (synopsis "Command line client for AWS") - (description "AWS CLI provides a unified command line interface to the -Amazon Web Services (AWS) API.") + (description + "AWS CLI provides a unified command line interface to the Amazon Web +Services (AWS) API.") (license license:asl2.0))) (define-public awscli-2