From patchwork Thu Jun 19 07:58:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43207 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 F28CE27BC4B; Thu, 19 Jun 2025 09:01:04 +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 4E7E927BC49 for ; Thu, 19 Jun 2025 09:01:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSACe-00008O-1M; Thu, 19 Jun 2025 04:00:56 -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 1uSABt-0008Hq-F3 for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:11 -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 1uSABq-0008Tu-83 for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:07 -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=KLSB1lKct6DBF2Qtr28RX/O3DchTtTmriIE/WHC1sUc=; b=XuluxvDuC3T9/nAHz8ikLn7zvlTropUVRlTh9LloiGZx+VzQ41TuvCyIjmD3VZlxfdZlFPAiVkwsRce6OWBQ/CmQefNuD6OKJ0FqH2uzBYbyQ7SV07ipH+SnParYMg4ZzNKrOD5y/4AFqDugNzAoz6koBwuxgW586+8fjUk2YEgrAtUnme/PX2v+GfXnICErQ4DYlsdCTbTxI2w2uaiKVvsPrRIYt0JWG/x/SdfqMyxhxOTVHzRpk7Wi9dZCC5Y8B8SujoVCdcb9zMZ+c5dl2Rxz0jqBO71G5ej5sgBZNfEn7fAC8g5DD1w1syHD2vY9PtGYzg9RvS95J0TtNksrDA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uSABp-0006vJ-Nk for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78828] [PATCH 2/8] build-system/pyproject: Add stestr, unittest and custom options. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Jun 2025 08:00:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78828 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78828@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78828-submit@debbugs.gnu.org id=B78828.175031995826158 (code B ref 78828); Thu, 19 Jun 2025 08:00:05 +0000 Received: (at 78828) by debbugs.gnu.org; 19 Jun 2025 07:59:18 +0000 Received: from localhost ([127.0.0.1]:60322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uSAAw-0006mQ-9x for submit@debbugs.gnu.org; Thu, 19 Jun 2025 03:59:18 -0400 Received: from 4.mo563.mail-out.ovh.net ([46.105.53.192]:34817) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uSAAr-0006lO-EM for 78828@debbugs.gnu.org; Thu, 19 Jun 2025 03:59:08 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bNCfv5JN2z1d8N; Thu, 19 Jun 2025 07:59:03 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78828@debbugs.gnu.org>; Thu, 19 Jun 2025 07:59:03 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.249.67]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bNCfv0BY8z1yVR; Thu, 19 Jun 2025 07:59:03 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.5]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 8EA48C3CAF; Thu, 19 Jun 2025 07:59:02 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-108S002078c0bf1-aafb-4213-93cc-d86e93aa8fb8, 129058C0FBD5227E7F6EF83700C8F3C5E5DC00BA) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 80.215.169.212 Date: Thu, 19 Jun 2025 09:58:48 +0200 Message-ID: <20250619075859.10878-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619075859.10878-1-ngraves@ngraves.fr> References: <20250619075859.10878-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 14071215564170584802 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtddvgdegleekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvedvfffhueeihfehheelgefgkefgieeljeeglefhffeghfehffeggedvleeggeeunecuffhomhgrihhnpehphihthhhonhdrohhrghdpphihphgrrdhiohenucfkphepuddvjedrtddrtddruddpkedtrddvudehrdduieelrddvuddvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkeekvdekseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=KLSB1lKct6DBF2Qtr28RX/O3DchTtTmriIE/WHC1sUc=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1750319943; v=1; b=y0TTe75dz64Hrk8lZA2a+HhE5CC1XbRZSDvpt5UhcKud2MSxlIR6Kkj0raKWhCXJgwDU+2je Hq64DLnYquW0Fg//gDFDzlYp37ogr0j7jKl5LLW09sz66CCthyZMRB2SZk6NYfnvCEJrbPUGeeA sk8AHh1vUBYjVE80Dt3UcPJ9Q4wM2fFRw6N3+NSvSNng/cVY/cISsEeXMxezz58lTeZgwMyuFCq lBTy7OeRXo5y12WkGB3SPuVeO22XCuGM8BLuU8WLR1plCKBdR8oiSTJayhkPJBMof0aGHJ8fIHo tEY+vPwaLaoc2FBpTBBR7qFbrFxUptTi5Zx0/JAIbDyLw== 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 * guix/build-system/pyproject.scm (check): Add stestr, unittest and custom test-backends. --- guix/build/pyproject-build-system.scm | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/guix/build/pyproject-build-system.scm b/guix/build/pyproject-build-system.scm index 1b66dce99c..1fa610faa9 100644 --- a/guix/build/pyproject-build-system.scm +++ b/guix/build/pyproject-build-system.scm @@ -150,18 +150,26 @@ (define* (check #:key tests? test-backend test-flags #:allow-other-keys) (let* ((pytest (which "pytest")) (nosetests (which "nosetests")) (nose2 (which "nose2")) + (stestr (which "stestr")) (have-setup-py (file-exists? "setup.py")) + ;; unittest default pattern + ;; See https://docs.python.org/3/library/unittest.html\ + ;; #cmdoption-unittest-discover-p + (tests-found (find-files "." "test.*\\.py$")) (use-test-backend (or test-backend ;; Prefer pytest (if pytest 'pytest #f) + (if stestr 'stestr #f) (if nosetests 'nose #f) (if nose2 'nose2 #f) - ;; But fall back to setup.py, which should work for most - ;; packages. XXX: would be nice not to depend on setup.py here? - ;; fails more often than not to find any tests at all. Maybe - ;; we can run `python -m unittest`? - (if have-setup-py 'setup.py #f)))) + ;; Fall back to setup.py. The command is deprecated, but is + ;; a superset of unittest, so should work for most packages. + ;; Keep it until setuptools removes `setup.py test'. + ;; See https://setuptools.pypa.io/en/latest/deprecated/\ + ;; commands.html#test-build-package-and-run-a-unittest-suite + (if have-setup-py 'setup.py #f) + (if tests-found 'unittest #f)))) (format #t "Using ~a~%" use-test-backend) (match use-test-backend ('pytest @@ -175,7 +183,11 @@ (define* (check #:key tests? test-backend test-flags #:allow-other-keys) (if (null? test-flags) '("test" "-v") test-flags))) - ('python + ('stestr + (apply invoke stestr "run" test-flags)) + ('unittest + (apply invoke "python" "-m" "unittest" test-flags)) + ('custom (apply invoke "python" test-flags)) ;; The developer should explicitly disable tests in this case. (else (raise (condition (&test-system-not-found)))))) From patchwork Thu Jun 19 07:58:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43206 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 4A14527BC4B; Thu, 19 Jun 2025 09:01:00 +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 7A6B227BC49 for ; Thu, 19 Jun 2025 09:00:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSACc-00005Q-Hk; Thu, 19 Jun 2025 04:00:54 -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 1uSABx-0008Ks-RI for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:17 -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 1uSABx-0000Dp-Fh for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:13 -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=WQ38m2GePbWqA6drY8xSJT8yCj/5kOBTCjRAhfh3/A0=; b=bh72mvL5mUISxVe57luy0ExxOCmTUC+cCdoCMWdSeSb9EZBxutYNgP62jAOpdNR1YGjVqgKlwEKmSgzmb63hF+CsVjAAoeeoA62CVFxIf/kpTvK4m6Xzidzp2tQSPTEbQ/v6CjQiVk3ajFgtCKyjtz0kqz7snu/i+RQn3lGMncVFLL4IQ4SDSr/E9Rm2nO6mzY5lgDw0Ray9nAVXctTm5I55zlQKxlBfBOhb5vVdDrhhdTHWJ2gbTYMxAwVMz9uQy0sujehF8derrLOAlsgf01/JXn6lzj52fNUFLtNlZ+TKvPRThFUjtQH6AUmWR8dwizgGA0VfiVrpflpG398auw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uSABx-0006wS-57 for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78828] [PATCH 3/8] gnu: ulauncher: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Jun 2025 08:00:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78828 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78828@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78828-submit@debbugs.gnu.org id=B78828.175031997126280 (code B ref 78828); Thu, 19 Jun 2025 08:00:12 +0000 Received: (at 78828) by debbugs.gnu.org; 19 Jun 2025 07:59:31 +0000 Received: from localhost ([127.0.0.1]:60332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uSABD-0006pL-S3 for submit@debbugs.gnu.org; Thu, 19 Jun 2025 03:59:30 -0400 Received: from 1.mo562.mail-out.ovh.net ([178.33.109.175]:42211) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uSAAs-0006lU-4V for 78828@debbugs.gnu.org; Thu, 19 Jun 2025 03:59:12 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bNCfw2QSpz1jX8; Thu, 19 Jun 2025 07:59:04 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78828@debbugs.gnu.org>; Thu, 19 Jun 2025 07:59:04 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.168.94]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bNCfw0qCQz1yXV; Thu, 19 Jun 2025 07:59:04 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.5]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id B3D04D440A1; Thu, 19 Jun 2025 07:59:03 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-97G0028f1398b7-03cf-431f-9587-5c5fcde20e7a, 129058C0FBD5227E7F6EF83700C8F3C5E5DC00BA) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 80.215.169.212 Date: Thu, 19 Jun 2025 09:58:49 +0200 Message-ID: <20250619075859.10878-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619075859.10878-1-ngraves@ngraves.fr> References: <20250619075859.10878-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 14071497036596044514 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtddvgdegleekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepteelfeettdejffeufffgffdujefguefhvdehkeefkeeghfevvdekfefhheekudelnecuffhomhgrihhnpehgihhthhhusgdrtghomhdpuhhlrghunhgthhgvrhdrihhonecukfhppeduvdejrddtrddtrddupdektddrvdduhedrudeiledrvdduvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeekkedvkeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=WQ38m2GePbWqA6drY8xSJT8yCj/5kOBTCjRAhfh3/A0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1750319944; v=1; b=rWJufVUb7oOd3ifYUz4xsCt19WNN1itLa3bnRDPWM+i5a/DQM36Lg5zVCuKQkl3p3ph17S0y EDw/FFpDhD/vsMjcq1N/zmQF9w+EUvR7taLuVPDvvJD5yWgM9rzxA4oS3SVe/5vfSjTi+ry+RRH KKi5baz5Rm2EifsYVC+IF517hK3+aNu6NyoP7J0lai8kmivdxmLG7dlSu1juf35RhwUYsDewNuB i9H0GqD03SM0Db72UKlzJZjciHFsLK3PfA3qQKu9iX4oDEZ/LQR3GxM1ts2E8vXvpkkhQXhz1oh utJ+0eRzIULAX4aSofj0rTWXFloQ+ptnpBG7r7Hd8NWRw== 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/xdisorg.scm (ulauncher): Run guix style and properly pin the commit with a git-version. --- gnu/packages/xdisorg.scm | 115 ++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 56 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 90bdbcba61..9d66718630 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2091,64 +2091,67 @@ (define-public xdpyprobe (license license:gpl3+))) (define-public ulauncher - (package - (name "ulauncher") - (version "6.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Ulauncher/Ulauncher") - (commit "1e68d47473f8e77d375cb4eca644c3cda68ed7e9"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1c2czlrsf5aq8c88qliqbnqvf04q9cnjc1j6hivqa0w260mzjll1")))) - (build-system python-build-system) - (arguments - (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'fix-libX11 - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "ulauncher/utils/xinit.py" - (("libX11.so.6") - (search-input-file inputs "/lib/libX11.so"))))) - (add-after 'unpack 'fix-usr - (lambda _ - (substitute* "setup.py" - (("\\{sys.prefix\\}") - (string-append #$output))))) - (add-after 'unpack 'fix-os-release - (lambda _ - (define (touch file) - (call-with-output-file file - (const #t))) - (let* ((hard-path "/etc/os-release") - (fixed-path (string-append #$output - hard-path))) - ;; Make it relative - ;; Update hardcoded path to something - ;; within the build enviroment. - (substitute* "ulauncher/utils/environment.py" - ((hard-path) - fixed-path)) - ;; Create directory for the dummy file. - (mkdir-p (string-append #$output "/etc")) - (touch fixed-path)))) - (add-before 'check 'env-setup - ;; The test require access to home to put temporary files. - (lambda _ - (setenv "HOME" - (getcwd))))))) - (native-inputs (list intltool python-distutils-extra python-mock)) - (inputs (list libx11 python-levenshtein python-pycairo)) - (propagated-inputs (list keybinder libwnck gsettings-desktop-schemas - python-pygobject webkitgtk-with-libsoup2)) - (home-page "https://ulauncher.io") - (synopsis "Application launcher for Linux") - (description - "Ulauncher is a fast application launcher for Linux. It is written in + (let ((commit "1e68d47473f8e77d375cb4eca644c3cda68ed7e9") + (revision "4")) + (package + (name "ulauncher") + (version (git-version "6.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ulauncher/Ulauncher") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1c2czlrsf5aq8c88qliqbnqvf04q9cnjc1j6hivqa0w260mzjll1")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-libX11 + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "ulauncher/utils/xinit.py" + (("libX11.so.6") + (search-input-file inputs "/lib/libX11.so"))))) + (add-after 'unpack 'fix-usr + (lambda _ + (substitute* "setup.py" + (("\\{sys.prefix\\}") + (string-append #$output))))) + (add-after 'unpack 'fix-os-release + (lambda _ + (define (touch file) + (call-with-output-file file + (const #t))) + (let* ((hard-path "/etc/os-release") + (fixed-path (string-append #$output hard-path))) + ;; Make it relative + ;; Update hardcoded path to something + ;; within the build enviroment. + (substitute* "ulauncher/utils/environment.py" + ((hard-path) + fixed-path)) + ;; Create directory for the dummy file. + (mkdir-p (string-append #$output "/etc")) + (touch fixed-path)))) + (add-before 'check 'env-setup + ;; The test require access to home to put temporary files. + (lambda _ + (setenv "HOME" + (getcwd))))))) + (native-inputs (list intltool python-distutils-extra python-mock)) + (inputs (list libx11 python-levenshtein python-pycairo)) + (propagated-inputs (list keybinder libwnck gsettings-desktop-schemas + python-pygobject webkitgtk-with-libsoup2)) + (home-page "https://ulauncher.io") + (synopsis "Application launcher for Linux") + (description + "Ulauncher is a fast application launcher for Linux. It is written in Python, using GTK+, and features: App Search (fuzzy matching), Calculator, Extensions, Shortcuts, File browser mode and Custom Color Themes.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public rofi (package From patchwork Thu Jun 19 07:58:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43211 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 6018827BC4B; Thu, 19 Jun 2025 09:01:40 +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 B7AC527BC49 for ; Thu, 19 Jun 2025 09:01:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSACp-0000JT-Ax; Thu, 19 Jun 2025 04:01:07 -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 1uSAC3-0008NY-Hb for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:21 -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 1uSAC0-0000IB-FW for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:17 -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=S4QD0saUsMtWYQf0t20nTn1HLH39sKYdAXx25LfrZt0=; b=JEgis/drXSqEtC9ZmAjczeD3ik68ZunnMZqf049iAxvsqcBmOO9MqkuYBf2OwPqIxCHUeSn6BdEfoEUY1nyeXSwDXQK9sW2umV1wb3GsS6anG9TAjZx/v88MGiWZXOqT98jfONE7ktwz3FJ+ZMMPwc9Nfyvc4JMKt91AUKcTj8sE7LbNc/b6Xmy1+d8rYrcaYN0IVKuBeXohpTGci9zHaYxNS8l7Dp97j5iOA/LYxiwkh0W9mCK+S6A6+TX3RYtHACFJgshaqwQqoq/iSZInk6FWvNvzRniYnA9lLnWwt4hBfMxzN3HT9vRovzQ6bc+CM0ikvo9EfE4dLGRJPEg0Hg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uSAC0-0006xO-1y for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78828] [PATCH 4/8] gnu: ulauncher: Update to 6.0.0-18.901ce03. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Jun 2025 08:00:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78828 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78828@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78828-submit@debbugs.gnu.org id=B78828.175031997526317 (code B ref 78828); Thu, 19 Jun 2025 08:00:15 +0000 Received: (at 78828) by debbugs.gnu.org; 19 Jun 2025 07:59:35 +0000 Received: from localhost ([127.0.0.1]:60334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uSABI-0006q5-Gv for submit@debbugs.gnu.org; Thu, 19 Jun 2025 03:59:34 -0400 Received: from 10.mo562.mail-out.ovh.net ([46.105.72.220]:52737) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uSAAt-0006lh-FZ for 78828@debbugs.gnu.org; Thu, 19 Jun 2025 03:59:12 -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 4bNCfx6ymSz1j8N; Thu, 19 Jun 2025 07:59:05 +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 <78828@debbugs.gnu.org>; Thu, 19 Jun 2025 07:59:05 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.118.15]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bNCfx4jm8z5wGd; Thu, 19 Jun 2025 07:59:05 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.5]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 369B7D440A2; Thu, 19 Jun 2025 07:59:05 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G003f8fe032a-cf1c-49d1-84fd-9cdd892e381a, 129058C0FBD5227E7F6EF83700C8F3C5E5DC00BA) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 80.215.169.212 Date: Thu, 19 Jun 2025 09:58:50 +0200 Message-ID: <20250619075859.10878-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619075859.10878-1-ngraves@ngraves.fr> References: <20250619075859.10878-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 14071778513519698658 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtddvgdegleekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepheeljedvudejfffgudduueeutddtvdejudeuudfgkedufeduteevteelleehteeunecuffhomhgrihhnpehulhgruhhntghhvghrrdhiohenucfkphepuddvjedrtddrtddruddpkedtrddvudehrdduieelrddvuddvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkeekvdekseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=S4QD0saUsMtWYQf0t20nTn1HLH39sKYdAXx25LfrZt0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1750319946; v=1; b=H4S3jceP0JQAk+15NKURLCp61RpYAquk8g4AqQHc15v0Q3x0U+7KIlDgbDQpZK5s1DdpyVSQ g1GTI6J2ys2m76qGgP2KRNFl6z/DHIfEYRjhtW2Ao1DtxI3Gso56J5d3EDrpqqyeL5Q7cCvaFvp Dg/DnObFAHNwnv0QyG0wr2zFnMahozQumrLeufjdwm8jdBi+QSGFVto4G8zFVpX+Purw6muhthd 4fRoUp35xtPZ3ILmy1luLWMwcitHuUEJYA7rdhs6KC8HaFQFAWjzyyVPvBSVDP7b+FoXV+NwK3V /G5U4vYjNhJJgBzmUexnkQJzLpUOOQNTH8bwRz0o6lQBw== 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/xdisorg.scm (ulauncher): Update to 6.0.0-18.901ce03. [build-system]: Switch to pyproject-build-system. [arguments]{test-flags}: Ignore some failing tests. {phases}: Remove deprecated phase 'fix-usr. Add phase 'fix-bash. [native-inputs]: Remove python-distutils-extra. Add python-pytest, python-pytest-mock, python-setuptools, python-wheel. [propagated-inputs]: Add python-xlib. --- gnu/packages/xdisorg.scm | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 9d66718630..f65d24b3d1 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2091,8 +2091,8 @@ (define-public xdpyprobe (license license:gpl3+))) (define-public ulauncher - (let ((commit "1e68d47473f8e77d375cb4eca644c3cda68ed7e9") - (revision "4")) + (let ((commit "901ce03beb157ff8fb354558594495eb74c6de7b") + (revision "18")) (package (name "ulauncher") (version (git-version "6.0.0" revision commit)) @@ -2104,10 +2104,14 @@ (define-public ulauncher (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1c2czlrsf5aq8c88qliqbnqvf04q9cnjc1j6hivqa0w260mzjll1")))) - (build-system python-build-system) + (base32 "0qrqpbqrrklfgqr48zafzggrbzns2q6h27nh63skfd9w582nsajg")))) + (build-system pyproject-build-system) (arguments (list + #:test-flags + ;; XXX: Most likely require a running X server. + #~(list "--ignore=tests/ui/test_preferences_server.py" + "--ignore=tests/ui/test_result_widget.py") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-libX11 @@ -2115,11 +2119,11 @@ (define-public ulauncher (substitute* "ulauncher/utils/xinit.py" (("libX11.so.6") (search-input-file inputs "/lib/libX11.so"))))) - (add-after 'unpack 'fix-usr - (lambda _ - (substitute* "setup.py" - (("\\{sys.prefix\\}") - (string-append #$output))))) + (add-after 'unpack 'fix-bash + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "tests/modes/shortcuts/test_run_script.py" + (("/bin/bash") + (search-input-file inputs "bin/bash"))))) (add-after 'unpack 'fix-os-release (lambda _ (define (touch file) @@ -2141,10 +2145,19 @@ (define (touch file) (lambda _ (setenv "HOME" (getcwd))))))) - (native-inputs (list intltool python-distutils-extra python-mock)) + (native-inputs (list intltool + python-mock + python-pytest + python-pytest-mock + python-setuptools + python-wheel)) (inputs (list libx11 python-levenshtein python-pycairo)) - (propagated-inputs (list keybinder libwnck gsettings-desktop-schemas - python-pygobject webkitgtk-with-libsoup2)) + (propagated-inputs (list keybinder + libwnck + gsettings-desktop-schemas + python-pygobject + python-xlib + webkitgtk-with-libsoup2)) (home-page "https://ulauncher.io") (synopsis "Application launcher for Linux") (description From patchwork Thu Jun 19 07:58:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43205 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 CAA4F27BC4B; Thu, 19 Jun 2025 09:00:50 +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 8C4F327BC4A for ; Thu, 19 Jun 2025 09:00:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSACQ-0008Tr-8a; Thu, 19 Jun 2025 04:00:46 -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 1uSABv-0008Iz-Sk for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:13 -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 1uSABu-0008Un-Mp for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:11 -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=U9BFzp6/xP+ZX0nFVWzE8CgBi0WjOrTE+GZSk+pH4ik=; b=Fq6NFQ6tJThLa/hHq+ysFDw3OXvLnDv4AdBtDIfcE0xFymlfukabC0VM+WyGi/rRwOPC89DG8xppN3an/N6eY8SbCcQhiNh0e2KXXspMYPhnGOJJnLljLO7EAvu9o4X+q5WVG8eej/8reBF8PQdzC1fXYI3bvJCfE/lBfD2/jw7HBExZzis5rE/2jWCXQAWwN5lipjSj0xd1VR+RcsR+4t7kL/mSa3HblCKkiIWu0+DlV8hOYwAwCfAODT5ztYDiiSmlWgcRoyr32LrHvi3YkhzGG7XEcKlBA9JaZfoti5XrGL0qCabCjxgPqpp5lAJmsH+g1LKrX40p/V0YcMxYjw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uSABu-0006w1-B0 for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78828] [PATCH 5/8] build-system/pyproject: Avoid PEP427 substitution on binary files. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Jun 2025 08:00:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78828 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78828@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78828-submit@debbugs.gnu.org id=B78828.175031996826252 (code B ref 78828); Thu, 19 Jun 2025 08:00:10 +0000 Received: (at 78828) by debbugs.gnu.org; 19 Jun 2025 07:59:28 +0000 Received: from localhost ([127.0.0.1]:60330 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uSABC-0006p0-Ax for submit@debbugs.gnu.org; Thu, 19 Jun 2025 03:59:27 -0400 Received: from 3.mo563.mail-out.ovh.net ([46.105.40.8]:46601) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uSAAv-0006lm-4p for 78828@debbugs.gnu.org; Thu, 19 Jun 2025 03:59:12 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bNCfy6CRBz1jys; Thu, 19 Jun 2025 07:59:06 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78828@debbugs.gnu.org>; Thu, 19 Jun 2025 07:59:06 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.96.178]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bNCfy54VBz1xnp; Thu, 19 Jun 2025 07:59:06 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.2]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 4597CBA41DC; Thu, 19 Jun 2025 07:59:06 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-100R0030427f881-23a3-4261-a770-3baacc51481f, 129058C0FBD5227E7F6EF83700C8F3C5E5DC00BA) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 80.215.169.212 Date: Thu, 19 Jun 2025 09:58:51 +0200 Message-ID: <20250619075859.10878-5-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619075859.10878-1-ngraves@ngraves.fr> References: <20250619075859.10878-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 14072059987057435362 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtddvgdegleekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdektddrvdduhedrudeiledrvdduvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeekkedvkeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=U9BFzp6/xP+ZX0nFVWzE8CgBi0WjOrTE+GZSk+pH4ik=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1750319946; v=1; b=4lIIPBIDUw1x2ApucqBjiejbbStB5ZU7//mXRVE0AN7dQ4HQrd+RCYih+InvRlMBSyhbqMx8 OYwNbNbkow8EZ7gPtI2BC65WlAdAU530ItUDRtT64aYW4luzShnVqC39//f8tiuqamd0ULmTMBv k+DluO6FZEmUbWOFxyO+tAd/7i1hL91Y7hc+a9GF4nnJfhVwtHGQYUgAFrVSHLiNbhac35Pm2E3 hgcSen34KcE6lVgWihEn6XztP79S2lSEKUtSoXmpKhmnsVfRPb9u0eUl3YA5b23K12L92aPbok/ flZZiAqwGzw8ZMcgH+2knTg8LjZs1TD3qCP3wZo+7bTJw== 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 In some rare cases, the dest-path can be an elf-file, which are unreadable by substitute*, leading to an error instead of just continuing which makes more sense in this case. * guix/build-system/pyproject.scm (check): Guard substitution attempt with basic readability guarantees. --- guix/build/pyproject-build-system.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/guix/build/pyproject-build-system.scm b/guix/build/pyproject-build-system.scm index 1fa610faa9..1ca91701c3 100644 --- a/guix/build/pyproject-build-system.scm +++ b/guix/build/pyproject-build-system.scm @@ -218,10 +218,11 @@ (define (expand-data-directory directory) (lambda (file) (chmod file #o755) ;; PEP 427 recommends that installers rewrite - ;; this odd shebang. - (substitute* file - (("#!python") - (string-append "#!" python "/bin/python")))) + ;; this odd shebang, but avoid the binary case. + (unless (elf-file? file) + (substitute* file + (("#!python") + (string-append "#!" python "/bin/python"))))) (find-files destination)))) ;; Data can be contained in arbitrary directory structures. Most ;; commonly it is used for share/. From patchwork Thu Jun 19 07:58:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43209 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 1E1CE27BC4B; Thu, 19 Jun 2025 09:01:22 +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 6E41C27BC49 for ; Thu, 19 Jun 2025 09:01:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSACr-0000LV-E2; Thu, 19 Jun 2025 04:01:09 -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 1uSAC4-0008OZ-43 for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:21 -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 1uSAC3-0000KF-Hl for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:19 -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=FGO58ef6t/QGx0gW94r4Zx3aBkhzZnR/5LhoUVcwBy8=; b=hUdPzzqEUxu4OqwcntNJDufGumE0n3EC9J4jWWQpeb9CB+1HvYJGYXL9+9JaoaW2YYMAYOOfVoS0nY2bHmpmmyYA4r0SJmXLwsAJf8PrW4s4uMbK4mjPgqqdWBiES0a41aKN23dz76hwlQAG8fFOHQKQEJuDDCfNsgt7wf6Op0ZJbvA/LVDRwBQh/GJ8HuqBqQBDZ/l7p0/tYTKDvsw+EAy6NkMlPZ6ukNQ6Yxfo8EL3tA6Jdggj3sRss3yai0hLQsFRx05lule+tfFyoqa6KvTk/e1TPcJyouSoGq9gQwSOf7iznsvUqxf+jzBiWRivB85kiqX6Ivbg//xUFMa3ig==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uSAC3-0006y5-6N for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78828] [PATCH 6/8] gnu: python-rich: Ignore more failing tests. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Jun 2025 08:00:18 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78828 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78828@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78828-submit@debbugs.gnu.org id=B78828.175031997626331 (code B ref 78828); Thu, 19 Jun 2025 08:00:18 +0000 Received: (at 78828) by debbugs.gnu.org; 19 Jun 2025 07:59:36 +0000 Received: from localhost ([127.0.0.1]:60336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uSABK-0006qL-OQ for submit@debbugs.gnu.org; Thu, 19 Jun 2025 03:59:35 -0400 Received: from 3.mo562.mail-out.ovh.net ([46.105.33.63]:44995) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uSAAw-0006mA-3M for 78828@debbugs.gnu.org; Thu, 19 Jun 2025 03:59:15 -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 4bNCg046pJz1dss; Thu, 19 Jun 2025 07:59:08 +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 <78828@debbugs.gnu.org>; Thu, 19 Jun 2025 07:59:08 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.188.49]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bNCg01sP0z5wGx; Thu, 19 Jun 2025 07:59:08 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id B0863DA3C9C; Thu, 19 Jun 2025 07:59:07 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-109S003f8fd325a-7a96-4d58-8cfb-39f0375f740f, 129058C0FBD5227E7F6EF83700C8F3C5E5DC00BA) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 80.215.169.212 Date: Thu, 19 Jun 2025 09:58:52 +0200 Message-ID: <20250619075859.10878-6-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619075859.10878-1-ngraves@ngraves.fr> References: <20250619075859.10878-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 14072622939918230242 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtddvgdegleekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdektddrvdduhedrudeiledrvdduvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeekkedvkeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=FGO58ef6t/QGx0gW94r4Zx3aBkhzZnR/5LhoUVcwBy8=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1750319948; v=1; b=REbpUkODHyN+P5f1b07XVaR3AcOghfLaO9lMqjJCnfP36kTVEBtH+6hhMM8B2s6Ren3ef9+2 eIljgdzV/E/Uv1WB5S362cEMKyW3nSqID6gjn511ETIK1vXEWsYhW0V+LYNFceL8icUiJmKI9UK o4dn8ajsJ8Z3fmgrbNZGKz3aUbYX38UcMbQ3v6f9PCmjjijblRLirgC8m2RXAXFXnDyqaioVnjB TYEHFerZiyYTbMCDP8BCf0AWPaxFhjJBFgMVbasjH/Ud+lx8Rk6e2S4vIKgFmRLl4VsUVLxC71R z4vUUG5cOsf8w9KJVzIqSKPEontGwMXFtudmhdbFJZl0Q== 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/python-xyz.scm (python-rich)[arguments][test-flags}: Ignore more failing tests. --- gnu/packages/python-xyz.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 49fddda272..768df10c80 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21655,7 +21655,9 @@ (define-public python-rich " and not test_python_render_simple_passing_lexer_instance" " and not test_python_render_indent_guides" " and not test_option_no_wrap" - " and not test_syntax_highlight_ranges")))) + " and not test_syntax_highlight_ranges" + " and not test_inline_code" + " and not test_blank_lines")))) (propagated-inputs (list python-markdown-it-py python-pygments)) (native-inputs From patchwork Thu Jun 19 07:58:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43210 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 4B16227BC4A; Thu, 19 Jun 2025 09:01:37 +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=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 3C99B27BC49 for ; Thu, 19 Jun 2025 09:01:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSACk-0000Di-1m; Thu, 19 Jun 2025 04:01:02 -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 1uSAC7-0008Qr-P4 for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:23 -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 1uSAC7-0000Kf-DN for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:23 -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=OsHlLnJewDj9XxzOhXba9S0z1iz5bNdCnR555WsovwA=; b=F8sWOvGC7FZ7tKtBFQ981jc5RYlp6+ktxBNIikVUfM/2AUBWyiJCo7LLi/TmDlR8irZ0siGD55lozB+Nzh6mUdW719Q2Xzhe5unzadn0c+72yEJwvZmUmKlZFCKNsnLouCVEnBwWNmcOgiJpE2pxRCNC/qreVapEloDDrPoQaRyM4c2dMrx8Oho1N4CiezHk83lA+SCnHlOLKV/GQQ067Rdx7EYjyOHaRljuU5a0uu5g2xP2SU0TT4ixA25A8xsJLdWbiXE1Ij+3+cO8tMU5cYSTNHPrvDkaEbqSdPNUOcwCtpLbgPOvTRC+Wx/5Qq6NVz0hw4wmeTxZH2szEZxutw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uSAC6-0006z2-VF for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:23 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78828] [PATCH 7/8] gnu: python-stestr: Rely on its own test-backend. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Jun 2025 08:00:22 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78828 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78828@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78828-submit@debbugs.gnu.org id=B78828.175031997826351 (code B ref 78828); Thu, 19 Jun 2025 08:00:22 +0000 Received: (at 78828) by debbugs.gnu.org; 19 Jun 2025 07:59:38 +0000 Received: from localhost ([127.0.0.1]:60338 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uSABL-0006qd-VV for submit@debbugs.gnu.org; Thu, 19 Jun 2025 03:59:37 -0400 Received: from 1.mo563.mail-out.ovh.net ([178.33.106.244]:37399) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uSAAx-0006mP-SS for 78828@debbugs.gnu.org; Thu, 19 Jun 2025 03:59:16 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bNCg16Gfzz1jvG; Thu, 19 Jun 2025 07:59:09 +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 <78828@debbugs.gnu.org>; Thu, 19 Jun 2025 07:59:09 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.231.2]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bNCg13Tl9z5wGk; Thu, 19 Jun 2025 07:59:09 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.1]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 0C811C3CB2; Thu, 19 Jun 2025 07:59:08 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G003c6751e3f-e305-4e26-8f70-c790f570c6f9, 129058C0FBD5227E7F6EF83700C8F3C5E5DC00BA) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 80.215.169.212 Date: Thu, 19 Jun 2025 09:58:53 +0200 Message-ID: <20250619075859.10878-7-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619075859.10878-1-ngraves@ngraves.fr> References: <20250619075859.10878-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 14072904412870992610 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtddvgdegleekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdektddrvdduhedrudeiledrvdduvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeekkedvkeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=OsHlLnJewDj9XxzOhXba9S0z1iz5bNdCnR555WsovwA=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1750319950; v=1; b=B8M5L0zzFgkhJfDqi7X5SGWCyIAH+htOf5FiW9NOQM6kz+d/iP6EDWL63UQ5ug6YXozWKXqc h6988fKfxmoy7y+w0vMA4QzGeInpL1VZJ42VJhQaNG0sIIrzEpDqYOhrR2AdXEbECkwhHKSuQj6 YrVgcJ0YuJHczsHZhpWwqCllFANd8iCmvdY/h3YPomK7qAxXvqFTNZxbvpmXBwq3a9tOtvxza5a SiCG1FVc6E0ghMeHun5ZOzg9pPxG+Yd1S3/AvGNy3wjpHcnQMvYfOycINHT+bS0AjM9W1Gy5ibd opmbSRfemytty5ydnDFTkXmcnzLVYlxsincQq8LN2FmpQ== 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/python-check.scm (python-stestr)[arguments]{phases}: Remove keyword. --- gnu/packages/python-check.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 587fbac11e..d75115f070 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -3599,19 +3599,11 @@ (define-public python-stestr (arguments (list #:test-flags - ;; Two tets fail. + ;; XXX: Two tests fail. #~(list "--exclude-regex" (string-join (list "test_initialise_expands_user_directory" "test_open_expands_user_directory") - "|")) - #:phases - #~(modify-phases %standard-phases - ;; TODO: Implement in pypproject-build-system's test-backends. - (replace 'check - (lambda* (#:key tests? test-flags #:allow-other-keys) - (when tests? - (let ((stestr (string-append #$output "/bin/stestr"))) - (apply invoke stestr "run" test-flags)))))))) + "|")))) (native-inputs (list python-ddt python-iso8601 From patchwork Thu Jun 19 07:58:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43208 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 3F8C027BC4B; Thu, 19 Jun 2025 09:01:09 +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 1D80E27BC49 for ; Thu, 19 Jun 2025 09:01:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSACn-0000Hy-2I; Thu, 19 Jun 2025 04:01:05 -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 1uSACB-0008SZ-ON for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:38 -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 1uSACB-0000L2-9s for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:27 -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=YSCKEMS+Jqmc01FAfdfso/E0UaXT7x7BLuScO4P6t8k=; b=HPGWaFb+Gdel6gIUaWVaQEGtECT/efTxNs2VTrjZm2C5k9FGvMl1H7OpFDjo94WQAlii9G4t9TMO53BoHy6Crm3xuiXHaxEbfFPw6+Jd46MT85dr8oZAfbtAGMADflA39MQXtggHXsg4RSVJv7NNnSBiEVlYUacLvfPo7E6Z1T+JLcNpc7EigfkzHVXGmAO7G7wE050x5MOhLVpibiQl3R5yXA95//nBmvQlOnraLV+2VjDSFotyFPKvXd8DYtAka+IFEln79t/D9g6Bd8PZ4uUqNm373QzHA6Sv1ijRYcbSMb9RI1uPJl6vJdAxSZxtZsUH5OZxNrFMR22eF8TjIg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uSACA-0006zo-TT for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:26 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78828] [PATCH 8/8] gnu: python-bandit: Rely on stestr test-backend. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Jun 2025 08:00:26 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78828 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78828@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78828-submit@debbugs.gnu.org id=B78828.175031998026373 (code B ref 78828); Thu, 19 Jun 2025 08:00:26 +0000 Received: (at 78828) by debbugs.gnu.org; 19 Jun 2025 07:59:40 +0000 Received: from localhost ([127.0.0.1]:60340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uSABN-0006qx-DB for submit@debbugs.gnu.org; Thu, 19 Jun 2025 03:59:39 -0400 Received: from 2.mo563.mail-out.ovh.net ([46.105.33.33]:37251) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uSAAy-0006mV-7h for 78828@debbugs.gnu.org; Thu, 19 Jun 2025 03:59:19 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bNCg24dppz1k7T; Thu, 19 Jun 2025 07:59:10 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78828@debbugs.gnu.org>; Thu, 19 Jun 2025 07:59:10 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.188.49]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bNCg23TVxz1yTg; Thu, 19 Jun 2025 07:59:10 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 23081BA41DC; Thu, 19 Jun 2025 07:59:10 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G0038db21f04-4322-4780-a171-c271118af570, 129058C0FBD5227E7F6EF83700C8F3C5E5DC00BA) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 80.215.169.212 Date: Thu, 19 Jun 2025 09:58:54 +0200 Message-ID: <20250619075859.10878-8-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619075859.10878-1-ngraves@ngraves.fr> References: <20250619075859.10878-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 14073185887954592482 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtddvgdegleekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdektddrvdduhedrudeiledrvdduvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeekkedvkeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=YSCKEMS+Jqmc01FAfdfso/E0UaXT7x7BLuScO4P6t8k=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1750319950; v=1; b=dVY+jgaaDvs0zuqhZ7kh5x6cG/fYHErJqYYPz0W7V/8/oo8NvPp1meC84j98oa8X3UeUE3E2 87F02fpGMmKgkR+zUcCt2VWy/iYeZp5VA01SgAHEHSmRLyu95IOrS6uVXUAvO3F7qu3OISxSgf/ AoYYda4ia7elHbh1r7r4jf8P9Uxue7RtrJuCV9tWosKSFhBmms17e/sapYHNo9blFbukwGQqD3V 33jy5RyoZca9UZxexEv7soJWm/uzNHlWJVHM725Dm/TYZ6CXpupl4YqFe3LFTDLY2C4DPfiG4rK lTGJzQfg1OobFcKBsYbxMbv0AtHGOay7Fx3YFcrD7nM3Q== 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/python-check.scm (python-bandit)[arguments]{phases}: Remove uneeded keyword. --- gnu/packages/python-check.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index d75115f070..88b7e3974b 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -312,15 +312,8 @@ (define-public python-bandit (arguments (list #:test-flags - ;; Two tets fail. - #~(list "--exclude-regex" "test_no_arguments|test_help_arg") - #:phases - #~(modify-phases %standard-phases - ;; TODO: Implement in pypproject-build-system's test-backends. - (replace 'check - (lambda* (#:key tests? test-flags #:allow-other-keys) - (when tests? - (apply invoke "stestr" "run" test-flags))))))) + ;; XXX: Two tests fail. + #~(list "--exclude-regex" "test_no_arguments|test_help_arg"))) (native-inputs (list python-beautifulsoup4 python-fixtures