From patchwork Thu May 9 22:53:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 27310 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 8D1C527BBE9; Thu, 9 May 2024 23:59:23 +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 4F8A627BBE2 for ; Thu, 9 May 2024 23:59:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5CiQ-00079S-S6; Thu, 09 May 2024 18:58:18 -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 1s5CiM-0006y5-8F for guix-patches@gnu.org; Thu, 09 May 2024 18:58:14 -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 1s5CiL-0006rm-Vq for guix-patches@gnu.org; Thu, 09 May 2024 18:58:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5CiK-0002sJ-9K for guix-patches@gnu.org; Thu, 09 May 2024 18:58:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70855] [PATCH 58/92] gnu: python-nbstripout: 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:58:12 +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.171529546910770 (code B ref 70855); Thu, 09 May 2024 22:58:12 +0000 Received: (at 70855) by debbugs.gnu.org; 9 May 2024 22:57:49 +0000 Received: from localhost ([127.0.0.1]:41242 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5Chw-0002nX-VO for submit@debbugs.gnu.org; Thu, 09 May 2024 18:57:49 -0400 Received: from 1.mo560.mail-out.ovh.net ([46.105.63.121]:48711) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5Chq-0002mU-8z for 70855@debbugs.gnu.org; Thu, 09 May 2024 18:57:43 -0400 Received: from director11.ghost.mail-out.ovh.net (unknown [10.109.176.25]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4Vb6qB5r9dz1Scy for <70855@debbugs.gnu.org>; Thu, 9 May 2024 22:57:42 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-jwdxq (unknown [10.110.113.182]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 7B6381FE5D; Thu, 9 May 2024 22:57:42 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-6684bf9d7b-jwdxq with ESMTPSA id Qvp0G+ZUPWZZ5A4AK4h2rg (envelope-from ); Thu, 09 May 2024 22:57:42 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-97G00265a588a9-8cc8-4f71-9a8b-b2e2c67908f7, E63BAB6C0A71DD4DA934779D5D345DF804807214) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Fri, 10 May 2024 00:53:53 +0200 Message-ID: <20240509225530.24649-58-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: 6117577144574141154 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdeffedgudehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpeelnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtkeehheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht 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/jupyter.scm (python-nbstripout): [build-system]: Move to pyproject-build-system. [arguments]: Convert 'check replacement phase from <#:phases> to <#:test-flags>. Use gexp. Change-Id: I4d97b0739c43371c149296b23951cb2c17129840 --- gnu/packages/jupyter.scm | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index 2c982b4c214..cf3fa509966 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -801,21 +801,19 @@ (define-public python-nbstripout (sha256 (base32 "1n57nvxsc94gz9w8ymi83bjkfhfwkpmx4y14m6gjrmlqd49m1aw6")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'delete-bad-tests - (lambda _ - ;; These tests use git and hg, and they are sensitive to the - ;; exact printed output. - (for-each delete-file (list "tests/test-git.t" - "tests/test-hg.t" - "tests/test-status.t" - "tests/test-uninstall.t")))) - (add-before 'check 'set-CRAMSHELL - (lambda _ - (setenv "CRAMSHELL" (which "bash"))))))) + (list + ;; These tests use git and hg, and they are sensitive to the + ;; exact printed output. + #:test-flags '(map (lambda (test) + (string-append "--ignore=tests/test-" test ".t")) + '("git" "hg" "status" "uninstall")) + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-CRAMSHELL + (lambda _ + (setenv "CRAMSHELL" (which "bash"))))))) (propagated-inputs (list python-nbformat)) (native-inputs (list python-pytest