From patchwork Thu May 9 22:53:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 27263 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 4A1A627BBE9; Thu, 9 May 2024 23:58: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 DE3DC27BBE2 for ; Thu, 9 May 2024 23:58:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5Chl-00066O-Px; Thu, 09 May 2024 18:57:37 -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 1s5ChW-0005z4-2B for guix-patches@gnu.org; Thu, 09 May 2024 18:57:22 -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 1s5ChS-0006U3-Jq for guix-patches@gnu.org; Thu, 09 May 2024 18:57:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5ChQ-0002iE-Uh for guix-patches@gnu.org; Thu, 09 May 2024 18:57:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70855] [PATCH 31/92] gnu: python-nbval: 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:57:16 +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.171529542810256 (code B ref 70855); Thu, 09 May 2024 22:57:16 +0000 Received: (at 70855) by debbugs.gnu.org; 9 May 2024 22:57:08 +0000 Received: from localhost ([127.0.0.1]:41142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5ChH-0002f9-Sm for submit@debbugs.gnu.org; Thu, 09 May 2024 18:57:08 -0400 Received: from 13.mo583.mail-out.ovh.net ([87.98.182.191]:44431) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5Ch6-0002c6-38 for 70855@debbugs.gnu.org; Thu, 09 May 2024 18:56:57 -0400 Received: from director8.ghost.mail-out.ovh.net (unknown [10.109.139.3]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4Vb6pJ4KVqz1NQl for <70855@debbugs.gnu.org>; Thu, 9 May 2024 22:56:56 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-fqgc7 (unknown [10.110.113.83]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 4E6361FD38; Thu, 9 May 2024 22:56:56 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-6684bf9d7b-fqgc7 with ESMTPSA id h76WELhUPWYprzIAeB+Qxg (envelope-from ); Thu, 09 May 2024 22:56:56 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S0039d59d8fd-f9ae-4cbd-9666-1d36d061b817, E63BAB6C0A71DD4DA934779D5D345DF804807214) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Fri, 10 May 2024 00:53:26 +0200 Message-ID: <20240509225530.24649-31-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: 6104629295197381346 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdeffedgudeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtkeehheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht 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-nbval): [build-system]: Move to pyproject-build-system. [arguments]: Move <#:phases> check phase replacement into proper <#:test-flags>. [propagated-inputs]: Add python-coverage which should have been there. Change-Id: I93aa282399eb52636ee5561b5d8fb7bb5b93f9e0 --- gnu/packages/python-check.scm | 48 ++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 913fc00ffc5..8e2164a82db 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1574,34 +1574,36 @@ (define-public python-nbval (uri (pypi-uri "nbval" version)) (sha256 (base32 "0h3xrnw0mj1srigrx2rfnd73h8s0xjycclmjs0vx7qkfyqpcvvyg")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'fix-test - (lambda _ - ;; This test fails because of a mismatch in the output of LaTeX - ;; equation environments. Seems OK to skip. - (delete-file - "tests/ipynb-test-samples/test-latex-pass-correctouput.ipynb"))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv" "-k" - (string-append - ;; This only works with Pytest < 5. - "not nbdime_reporter" - ;; https://github.com/computationalmodelling/nbval/pull/148. - " and not test_timeouts" - ;; It seems the output format has changed; the following - ;; test fails with "Unexpected output fields from - ;; running code: {'text/plain'}". - " and not test_conf_ignore_stderr ")))))))) + (list + #:test-flags + '(list + ;; This test fails because of a mismatch in the output of LaTeX + ;; equation environments. Seems OK to skip. + "--ignore=tests/ipynb-test-samples/test-latex-pass-correctouput.ipynb" + "-k" (string-append + ;; This only works with Pytest < 5. + "not nbdime_reporter" + ;; https://github.com/computationalmodelling/nbval/pull/148. + " and not test_timeouts" + ;; It seems the output format has changed; the following + ;; test fails with "Unexpected output fields from + ;; running code: {'text/plain'}". + " and not test_conf_ignore_stderr ")) + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'fix-test + (lambda _ + ;; This test fails because of a mismatch in the output of LaTeX + ;; equation environments. Seems OK to skip. + (delete-file "tests/\ +ipynb-test-samples/test-latex-pass-correctouput.ipynb")))))) (native-inputs (list python-pytest python-pytest-cov python-sympy)) (propagated-inputs (list python-ipykernel python-jupyter-client python-nbformat - python-six)) + python-six python-coverage)) (home-page "https://github.com/computationalmodelling/nbval") (synopsis "Pytest plugin to validate Jupyter notebooks") (description