From patchwork Tue Apr 22 14:00:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41937 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 909FE27BC4B; Tue, 22 Apr 2025 15:03:47 +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 CFF7827BC49 for ; Tue, 22 Apr 2025 15:03:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7ECV-00086R-Ge; Tue, 22 Apr 2025 10:02:15 -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 1u7ECK-0007uQ-5c for guix-patches@gnu.org; Tue, 22 Apr 2025 10:02: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 1u7ECJ-0006gt-SI for guix-patches@gnu.org; Tue, 22 Apr 2025 10:02:03 -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=u2Bv2lqDjZcdv655wFAteF4ItiF8wJCGvx1rNMwVTSs=; b=Fb735ae5JdueJVCVMcTUhBRO3OM7cDjH2jiwFvIM5eRA4jxWyNw/0a6daFLsuprh6IotDC+wuTFCysPhSW2XJdYzJDKkUt5UWwwYfqO7HCirBysAzlHY3exlEpBYza9RH2pgv0lUlgXuTevddaxdSRp2cGJ9rYqOmhoA+r+9+bxJqLzSdsTNqQE/MEQR9Y0g5LrNbRTMKyNRDqVtx/53cPV1+jqRB2HuSjzzY4KdVoNEQL0JI1XzuFplzIbd5liBdi6+5bertRt7USmNUTCz942aT98JRZo70PLiL2Nquq0VBk5Y+FH/PQcpZfWaMSoQl5eXXNUBoGl7jgUukNOelg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u7ECJ-0005FE-F4 for guix-patches@gnu.org; Tue, 22 Apr 2025 10:02:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77895] [PATCH v2 05/10] gnu: gitless: Fix build and disable failing tests. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Apr 2025 14:02:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77895 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77895@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 77895-submit@debbugs.gnu.org id=B77895.174533047820032 (code B ref 77895); Tue, 22 Apr 2025 14:02:03 +0000 Received: (at 77895) by debbugs.gnu.org; 22 Apr 2025 14:01:18 +0000 Received: from localhost ([127.0.0.1]:49100 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7EBZ-0005D1-S4 for submit@debbugs.gnu.org; Tue, 22 Apr 2025 10:01:18 -0400 Received: from 4.mo563.mail-out.ovh.net ([46.105.53.192]:33997) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7EBO-0005BW-9Z for 77895@debbugs.gnu.org; Tue, 22 Apr 2025 10:01:07 -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 4ZhkRN54D8z1bXy; Tue, 22 Apr 2025 14:01:04 +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 <77895@debbugs.gnu.org>; Tue, 22 Apr 2025 14:01:04 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.108.25.96]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZhkRN3PmYzHqbf; Tue, 22 Apr 2025 14:01:04 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.2]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id F3B50263A0B; Tue, 22 Apr 2025 14:01:03 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-101G004bcfcce75-e466-43ee-a1f4-f425f10ccd8b, 0A1BC1951B487096A19EF2AF6351B65704E5605C) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Tue, 22 Apr 2025 16:00:32 +0200 Message-ID: <20250422140051.2273-5-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250422140051.2273-1-ngraves@ngraves.fr> References: <20250422140051.2273-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 11610279840077767394 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvgeefledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejjeekleehseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=u2Bv2lqDjZcdv655wFAteF4ItiF8wJCGvx1rNMwVTSs=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1745330464; v=1; b=xwf2hnHxBZJYLWLUwKmnMorlqmCN5+AzD3qaWNUMRPSlKyWyp3DK1W60/EFIRpIKtOaDofnu I5cCndIo2QHG7RfWp5VjspLLl8VTvPPmH2eqyUe8n6uT+X+NGvLgzhPmUn5TowliBrNS3N+LDE4 23aiv/xAM8fVskPM76q97n06Y3ENPZJMyzc8VY2C/QhCqmD2daT/zkcgbRx7BOKJT2gXNMRE/KN YivSgAJcsj5++TZYQ4+7Nv97hktNuW6EEwMQswXFFlPbGHn6EOJ1D65HIFxoRQrEz6TrCBodm9h +eMt53Y5ccOLZaIG8JxFf2hIfrMHCuwLzn/MNcVDTvpZw== 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/version-control.scm (gitless) [build-system]: Switch to pyproject-build-system. [arguments]{test-flags}: Disable failing tests. {phases}: Improve git configuration in phase 'prepare-for-tests. Improve style of 'wrap phase. [native-inputs]: Add python-pytest, python-setuptools, python-wheel. --- gnu/packages/version-control.scm | 35 ++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 8d6709f7f6..d9e7dd249f 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -940,9 +940,21 @@ (define-public gitless (sha256 (base32 "048kl27zjr68hgs70g3l98ci9765wxva6azzrhcdys7nsdd493n6")) (file-name (git-file-name name version)))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list + ;; XXX: Unclear why these tests fail. + #:test-flags + #~(list "-k" + (string-append "not test_exclude_one" + " and not test_exclude_some" + " and not test_ip_commit" + " and not test_only_one" + " and not test_only_some" + " and not test_basic_functionality" + " and not test_conflicts" + " and not test_conflicts_switch" + " and not test_nothing_to_fuse")) #:phases #~(modify-phases %standard-phases (add-before 'build 'loosen-requirements @@ -959,20 +971,21 @@ (define-public gitless ;; The tests try to run git as if it were already set up. (setenv "HOME" (getcwd)) (invoke "git" "config" "--global" "user.email" "git@example.com") - (invoke "git" "config" "--global" "user.name" "Guix"))) + (invoke "git" "config" "--global" "user.name" "Guix") + (invoke "git" "config" "--global" "color.ui" "true"))) (replace 'wrap - (lambda* (#:key inputs #:allow-other-keys) - (let ((out #$output) - (git (search-input-file inputs "bin/git"))) - (wrap-program (string-append out "/bin/gl") + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((git (search-input-file inputs "bin/git"))) + (wrap-program (string-append #$output "/bin/gl") `("PATH" ":" prefix (,(dirname git))) `("GUIX_PYTHONPATH" ":" = - (,(string-append out "/lib/python" - #$(version-major+minor - (package-version python)) - "/site-packages:") + (,(string-append (site-packages inputs outputs) ":") ,(getenv "GUIX_PYTHONPATH")))))))))) - (native-inputs (list git-minimal)) + (native-inputs + (list git-minimal + python-pytest + python-setuptools + python-wheel)) (inputs (list bash-minimal git-minimal