From patchwork Thu May 9 22:52:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 64199 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 D39C327BBEA; Thu, 9 May 2024 23:56:13 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 43C2127BBE9 for ; Thu, 9 May 2024 23:56:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5CgI-0005TS-Pb; Thu, 09 May 2024 18:56:06 -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 1s5CgG-0005Su-HY for guix-patches@gnu.org; Thu, 09 May 2024 18:56:04 -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 1s5CgG-0006Fq-9I for guix-patches@gnu.org; Thu, 09 May 2024 18:56:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5CgE-0002WL-Jf for guix-patches@gnu.org; Thu, 09 May 2024 18:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70855] [PATCH 03/92] gnu: python-black: Move to pyproject-build-system. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 May 2024 22:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70855 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70855@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 70855-submit@debbugs.gnu.org id=B70855.17152953599663 (code B ref 70855); Thu, 09 May 2024 22:56:02 +0000 Received: (at 70855) by debbugs.gnu.org; 9 May 2024 22:55:59 +0000 Received: from localhost ([127.0.0.1]:41026 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5CgA-0002Vm-Pz for submit@debbugs.gnu.org; Thu, 09 May 2024 18:55:59 -0400 Received: from 11.mo582.mail-out.ovh.net ([188.165.38.119]:39097) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5Cg7-0002Va-NS for 70855@debbugs.gnu.org; Thu, 09 May 2024 18:55:56 -0400 Received: from director4.ghost.mail-out.ovh.net (unknown [10.109.176.8]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4Vb6n84nCHz13s8 for <70855@debbugs.gnu.org>; Thu, 9 May 2024 22:55:56 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-xsx8j (unknown [10.110.168.221]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 60E731FE65; Thu, 9 May 2024 22:55:56 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-6684bf9d7b-xsx8j with ESMTPSA id +j9LEHxUPWYpfR4A48Rr2Q (envelope-from ); Thu, 09 May 2024 22:55:56 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G004a21b9f04-29c9-4d73-956b-8ca0316690d6, E63BAB6C0A71DD4DA934779D5D345DF804807214) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Fri, 10 May 2024 00:52:58 +0200 Message-ID: <20240509225530.24649-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240509225530.24649-1-ngraves@ngraves.fr> References: <20240509225530.24649-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 6087740799976202978 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdeffedgudeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutddunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejtdekheehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvpdhmohguvgepshhmthhpohhuth 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-black): Improve package style. [build-system]: Move to pyproject-build-system. [arguments]<#:phases>: Improve style of use-absolute-file-names phase. Remove phase check. Change-Id: If2da4b3b0fea4928d1aeb270fbaa4167f20a6ee5 --- gnu/packages/python-xyz.scm | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c1590c2b568..862efc0f5b5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8262,22 +8262,16 @@ (define-public python-black (sha256 (base32 "0yfahlqc7dsdp1js0cbv706apldnfnlbal9b53cww8n0hs40n0im")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments `(#:phases (modify-phases %standard-phases (add-after 'patch-source-shebangs 'use-absolute-file-names - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (let* ((inpts (or native-inputs inputs)) - (python3 (search-input-file inpts "/bin/python3"))) - (substitute* (find-files "tests" "\\.py$") - (("#!/usr/bin/env python3(\\.[0-9]+)?" _ minor-version) - (string-append "#!" python3 (if (string? minor-version) - minor-version - ""))))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? (invoke "pytest" "-vv"))))))) + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "tests" "\\.py$") + (("#!/usr/bin/env python3") + (string-append + "#!" (search-input-file inputs "/bin/python3"))))))))) (propagated-inputs (list python-click python-attrs