From patchwork Mon Mar 31 06:18:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41062 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 7C08627BBEA; Mon, 31 Mar 2025 07:21:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 EC19027BBE2 for ; Mon, 31 Mar 2025 07:21:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tz8WN-00055C-OV; Mon, 31 Mar 2025 02:21:20 -0400 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 1tz8W9-0004xD-Bm for guix-patches@gnu.org; Mon, 31 Mar 2025 02:21:05 -0400 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 1tz8W9-00089L-2S for guix-patches@gnu.org; Mon, 31 Mar 2025 02:21:05 -0400 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=YjvMCFPIdUMQMiRHKZEdWm1GcV58aLz97xx+tbYdZIw=; b=O+NUl6+0ahC22ds1m+JkEDNuc0pJZ6PudAr1JDVE2KF5CfyWSJ66YWHk7ogeSXda4KorcOW5qdVn9asiAm27gJucTxgLX2pGYnwczr+bf+ZssEZEXbwCzc/OmGWnkj4bozMzV/rapYf/SRB8W/ZXGq3fxHVAysoDJG+Ap7IUpNnqD479Qi13Emj6K/1L6ejXYikEbyUQtY2RsWLrJTpOnbE3gLVk4vWkoYv6Qe215He6vhKpg+fnriyY6hH7b+PRn1yw2OghlSm4OQld/tCU7mjGjpVWYseraJQSPSvw4p17R2fIlHOyR3WUh5W4VY5AjUbYQEdNeP2xkCZWaaXkTg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tz8W8-0007MZ-So for guix-patches@gnu.org; Mon, 31 Mar 2025 02:21:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77400] [PATCH 09/26] gnu: python-locust: Update to 2.33.2. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Mar 2025 06:21:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77400 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77400@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 77400-submit@debbugs.gnu.org id=B77400.174340202927903 (code B ref 77400); Mon, 31 Mar 2025 06:21:04 +0000 Received: (at 77400) by debbugs.gnu.org; 31 Mar 2025 06:20:29 +0000 Received: from localhost ([127.0.0.1]:39270 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tz8VY-0007FS-26 for submit@debbugs.gnu.org; Mon, 31 Mar 2025 02:20:28 -0400 Received: from 3.mo562.mail-out.ovh.net ([46.105.33.63]:41235) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tz8UO-0006yX-8m for 77400@debbugs.gnu.org; Mon, 31 Mar 2025 02:19:19 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZR1Dc62CZz1VLr; Mon, 31 Mar 2025 06:19:12 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <77400@debbugs.gnu.org>; Mon, 31 Mar 2025 06:19:12 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.118.251]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZR1Dc3pSYzHcF5; Mon, 31 Mar 2025 06:19:12 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.3]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id E3071DA393D; Mon, 31 Mar 2025 06:19:11 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-102R00440829498-2141-40e9-a049-1f4c7b2979f4, 87830A87949A0BA70EB5F3889DD10BC79FDA47E2) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Mon, 31 Mar 2025 08:18:37 +0200 Message-ID: <20250331061901.22670-9-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250331061901.22670-1-ngraves@ngraves.fr> References: <20250331061901.22670-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 3737987694094443234 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeeludekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejjeegtddtseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=YjvMCFPIdUMQMiRHKZEdWm1GcV58aLz97xx+tbYdZIw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1743401953; v=1; b=hr7wumz/fXXZ/gVhIbaNYsuUCEviq94Z9zSJckYpKAgavlWnklC+rCGkoRDY8Y/4EAvm2vXY Ov3cPrB7CaUadX5uxbJugacRt3hXb/dV6PN1k8vjRVD+VawECtlmJ01fUJrX1I+7F0jQ9/V1wS/ 313KkaBqskIpgdvklpdob+GE4Y1U80cwD0E1ajrshPhcc6N/0OAxH+gHDQvC4OLDKfeD7m51nU0 7iiwEEXD5z72hR9OxRZsqOhDlSFjnXVU/kIXKwR803drAVWNPc4lXUO+tLP9DWFj/6H/vwQesOU HGZoLji2KoSx0Vz0B8hrfxt4dg9J370RHvWV54A+vZhYA== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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/benchmark.scm (python-locust): Update to 2.33.2. [arguments]{test-flags}: Add additional missing test. {phases}: Add phase 'pretend-version. Adapt phase fix-version. [native-inputs]: Remove python-poetry-core, python-poetry-dynamic-versioning. Add python-hatchling, python-hatch-vcs. --- gnu/packages/benchmark.scm | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 8743dc66aa..bc630bf723 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -402,7 +402,7 @@ (define (mark-as-non-free directory) (define-public python-locust (package (name "python-locust") - (version "2.32.5") + (version "2.33.2") ;; The archive on Pypi has no tests. (source (origin (method git-fetch) @@ -412,7 +412,7 @@ (define-public python-locust (file-name (git-file-name name version)) (sha256 (base32 - "0nmhk2k0mbza9slqgms42s6hsfwwmyr275l90an02qaypx066l1n")))) + "055is6plxjajzp7v5q108n90j5mvdaylpna98kw9zsqn7mvfq7ms")))) (build-system pyproject-build-system) (arguments (list @@ -484,10 +484,21 @@ (define-public python-locust "not test_ramp_up_from_0_to_100_000_users_with_50_user_classes_and_1000_workers_and_5000_spawn_rate" ;; This test fails with "AssertionError: ;; 'stopped' != 'stopping'". - "not test_distributed_shape") " and ")) + "not test_distributed_shape" + ;; This test fails with AssertionError: + ;; "locust [...] != .locust-real" + "not test_invalid_stop_timeout_string" + ) " and ")) #:phases #~(modify-phases %standard-phases ;; The build system attempts to detect the version by spawning git. + (add-after 'unpack 'pretend-version + (lambda _ + (substitute* "pyproject.toml" + (("^dynamic = \\[\"version\"\\].*$") + (format #f "version = ~s~%" #$version)) + (("^source = \"vcs\".*$") + "source = \"static\"\n")))) (add-after 'unpack 'fix-version (lambda _ (let ((tuple (list @@ -518,9 +529,15 @@ (define-public python-locust "))))) (substitute* "pyproject.toml" - (("setuptools = \">=70.0.0\"") "setuptools = \">=67.0.0\"") - (("^version =.*") (string-append "version = \"" #$version "\"\n")) - (("enable = true") "enable = false")))) + (("\"setuptools>=.*\",") + (string-append "\"setuptools>=" + #$(package-version + (this-package-input "python-setuptools")) + "\",")) + (("^version =.*") + (string-append "version = \"" #$version "\"\n")) + (("enable = true") + "enable = false")))) (add-before 'check 'increase-resource-limits (lambda _ ;; XXX: Copied from ungoogled-chromium. @@ -552,8 +569,8 @@ (define-public python-locust python-werkzeug)) (native-inputs (list nss-certs-for-test - python-poetry-core - python-poetry-dynamic-versioning + python-hatchling + python-hatch-vcs python-pyquery python-pytest python-retry))