From patchwork Fri Apr 18 11:46:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41765 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 14A0927BC4A; Fri, 18 Apr 2025 12:49:48 +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 727A927BC49 for ; Fri, 18 Apr 2025 12:49:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5kCc-0006ph-AW; Fri, 18 Apr 2025 07:48:14 -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 1u5kCa-0006of-MJ for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:12 -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 1u5kCa-0007cO-Bw for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:12 -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=utkb50pZCtrNhbGG39idZ8QJ5TgWYzY+/ujPawvwdANS+rdF0bhvk2lre6Oms+1hCOkwiJZ/6exFn+qrgJ5jwvU6ONdUsab5c1fCvjrV5zzflasM/opcDFycjGfBSE5x/fut7VW12uC39VypiCV6Wtl5zOyGJ6qk+Yv1ZHluvisGgLzUisKzOiaTMYYO5msM8eUsMaOuMAGWyL+VvhlIvUXdlIU87CwouxujICPQvhtK+rsYBlAFrgEnz4KQPyQ5mxu8ulvtLduqOYTs8yzVSNpjdwA+adpL2a3sU0mErI+H1A0PvfACgZUSBpCN1H5InZ5v7vF+fvXRgvkjyOEEpQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u5kCa-0007wJ-5l for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77895] [PATCH 7/7] gnu: gitless: Fix build and disable failing tests. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Apr 2025 11:48:12 +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.174497686730241 (code B ref 77895); Fri, 18 Apr 2025 11:48:12 +0000 Received: (at 77895) by debbugs.gnu.org; 18 Apr 2025 11:47:47 +0000 Received: from localhost ([127.0.0.1]:50450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5kC9-0007rK-3z for submit@debbugs.gnu.org; Fri, 18 Apr 2025 07:47:47 -0400 Received: from 3.mo563.mail-out.ovh.net ([46.105.40.8]:46309) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u5kBR-0007hC-Qj for 77895@debbugs.gnu.org; Fri, 18 Apr 2025 07:47:06 -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 4ZfCfL71rkz1R25; Fri, 18 Apr 2025 11:46:50 +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 <77895@debbugs.gnu.org>; Fri, 18 Apr 2025 11:46:50 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.118.55]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZfCfL68mtzyF8; Fri, 18 Apr 2025 11:46:50 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 7644CDA3A06; Fri, 18 Apr 2025 11:46:50 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-103G005f2a35fb1-a13f-41b6-8634-86661f915a95, 87B5F7520F1C12C50596DB6AAE10C577A8A8D40E) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 18 Apr 2025 13:46:25 +0200 Message-ID: <20250418114642.2538-7-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250418114642.2538-1-ngraves@ngraves.fr> References: <20250418114642.2538-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4299248797975634658 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvfedvtdejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejjeekleehseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=u2Bv2lqDjZcdv655wFAteF4ItiF8wJCGvx1rNMwVTSs=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1744976811; v=1; b=3Quql5ki/nGwbhnNHBjHVIkZ9VLHA6TKZ57/mDi+mQ6l7odVVGtahTl8dRgqOH3EyoUvl9wm 4inwNkjNNROrWpFa+ZpH5YoNjNcScAMPfKUsHAa4jVQcre+6VRg8isskHoTr+iYgI05URw1ntQY yBMmx42m2KnkFZaq5haDza7bYMgQNPldgJTzUwZ4g9R7g9Ne2ETlkXvD6V9mmR3uqinX655+EVR wF+RVw3i21+9XjC4XimUYqKHVB3DTQEEnMLLP0g/RWvTQE0SIL/ZKTfvJhehqv31YYkfGECFr7/ s4KvT/THBa1aWKdD7OWLzvNG7WfIUS8pTwM7tXOy8rNEg== 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