From patchwork Sat Jun 1 15:37:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 65097 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 3E35D27BBEB; Sat, 1 Jun 2024 16:41:03 +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,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 1C30F27BBE2 for ; Sat, 1 Jun 2024 16:40:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sDQqk-00020v-R1; Sat, 01 Jun 2024 11:40:54 -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 1sDQqi-0001wG-GA for guix-patches@gnu.org; Sat, 01 Jun 2024 11:40:52 -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 1sDQqi-0008E4-7i for guix-patches@gnu.org; Sat, 01 Jun 2024 11:40:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sDQqt-0003lk-U3 for guix-patches@gnu.org; Sat, 01 Jun 2024 11:41:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70858] [PATCH python-team v2 30/32] build-system/pyproject: Stop hiding options. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 01 Jun 2024 15:41:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70858 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70858@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 70858-submit@debbugs.gnu.org id=B70858.171725643114392 (code B ref 70858); Sat, 01 Jun 2024 15:41:03 +0000 Received: (at 70858) by debbugs.gnu.org; 1 Jun 2024 15:40:31 +0000 Received: from localhost ([127.0.0.1]:57238 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDQqM-0003k3-KP for submit@debbugs.gnu.org; Sat, 01 Jun 2024 11:40:31 -0400 Received: from 1.mo560.mail-out.ovh.net ([46.105.63.121]:48151) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDQqK-0003jU-Bd for 70858@debbugs.gnu.org; Sat, 01 Jun 2024 11:40:29 -0400 Received: from director6.ghost.mail-out.ovh.net (unknown [10.108.9.204]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4Vs41q3QSFz1SMy for <70858@debbugs.gnu.org>; Sat, 1 Jun 2024 15:40:15 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-rnhkd (unknown [10.110.168.168]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 3C8011FD72; Sat, 1 Jun 2024 15:40:15 +0000 (UTC) Received: from ngraves.fr ([37.59.142.105]) by ghost-submission-6684bf9d7b-rnhkd with ESMTPSA id jNinDd9AW2YUKBUA6NNaiw (envelope-from ); Sat, 01 Jun 2024 15:40:15 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-105G006a731f651-9c50-46a3-9a48-92683c160b01, 066A105622CFB65C0C1E9735678F98E7108F9FA5) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Sat, 1 Jun 2024 17:37:02 +0200 Message-ID: <20240601153854.30805-31-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240601153854.30805-1-ngraves@ngraves.fr> References: <20240601153854.30805-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4674454940328714978 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdekkedgleduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtkeehkeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht 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/pdf.scm (python-pydyf, weasyprint)[arguments] <#:test-flags>: Remove arguments hiding coverage options. * gnu/packages/python-crypto.scm (python-keyring) [arguments]<#:test-flags>: Remove arguments hiding coverage options. * gnu/packages/python-web.scm (python-asgi-csrf, python-asgi-lifespan, python-openapi-schema-validator, python-openapi-spec-validator, python-openapi-core)[arguments]<#:test-flags>: Remove arguments hiding coverage options. (python-openapi-schema-validator, python-openapi-spec-validator) [arguments]<#:phases>: Remove 'remove-coverage-pytest-options phase. (python-cssselect2, python-tinycss2)[arguments]: Remove uneeded field. (python-jsonpickle)[arguments]<#:test-flags>: Remove uneeded test-flags. * gnu/packages/python-xyz.scm (python-cattrs) [arguments]<#:phases>: Remove arguments hiding coverage options. Change-Id: Ibe08ecfebf8a24259c8658918d98fe9e5a8925b7 --- gnu/packages/pdf.scm | 6 +--- gnu/packages/python-crypto.scm | 1 - gnu/packages/python-web.scm | 51 ++++------------------------------ gnu/packages/python-xyz.scm | 4 +-- 4 files changed, 7 insertions(+), 55 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 4e260d614de..16d4d9336e3 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -816,9 +816,6 @@ (define-public python-pydyf (sha256 (base32 "18q43g5d9455msipcgd5fvnh8m4a2rz189slzfg80yycjw66rshs")))) (build-system pyproject-build-system) - (arguments - (list - #:test-flags #~'("-c" "/dev/null"))) (propagated-inputs (list python-pillow)) (native-inputs (list ghostscript @@ -1635,8 +1632,7 @@ (define-public weasyprint (build-system pyproject-build-system) (arguments (list - #:test-flags #~(list "-c" "/dev/null" - "-n" (number->string (parallel-job-count))) + #:test-flags #~(list "-n" (number->string (parallel-job-count))) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-library-paths diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 6965a330624..6139856a906 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -288,7 +288,6 @@ (define-public python-keyring (build-system pyproject-build-system) (arguments (list - #:test-flags '(list "-c" "/dev/null") ;avoid extra test dependencies #:phases #~(modify-phases %standard-phases (add-before 'check 'workaround-test-failure diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f956ad5b0c2..ef786e59308 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -738,10 +738,7 @@ (define-public python-asgi-csrf (build-system pyproject-build-system) (arguments (list #:test-flags - ;; Provide a null config to avoid the extraneous dependency on - ;; python-pytest-coverage. - #~(list "-c" "/dev/null" - ;; Disable two failing tests (see: + #~(list ;; Disable two failing tests (see: ;; https://github.com/simonw/asgi-csrf/issues/24). "-k" (string-append "not (test_multipart " @@ -780,8 +777,7 @@ (define-public python-asgi-lifespan (arguments (list #:test-flags - '(list "-c" "/dev/null" ;ignore coverage-related options - "-k" + '(list "-k" (string-append ;; XXX: Some tests fail because of a 'lifespan.shutdown.failed' ;; extra event, perhaps because our version of trio is older. @@ -1529,10 +1525,7 @@ (define-public python-jsonpickle (build-system pyproject-build-system) (arguments (list - #:test-flags - ;; Prevent running the flake8 and black pytest plugins, which only tests - ;; style and frequently causes harmless failures. - '(list "-o" "addopts=''" "tests") + #:test-flags '(list "tests") #:phases '(modify-phases %standard-phases (add-before 'check 'pre-check @@ -2175,13 +2168,7 @@ (define-public python-openapi-schema-validator (list #:test-flags ;; This one returns 5 instead of 4 elements - '(list "-k" "not test_array_prefixitems_invalid") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'remove-coverage-pytest-options - (lambda _ - (substitute* "pyproject.toml" - (("^--cov.*") ""))))))) + '(list "-k" "not test_array_prefixitems_invalid"))) (native-inputs (list python-poetry-core python-pytest)) (propagated-inputs (list python-isodate @@ -2219,13 +2206,7 @@ (define-public python-openapi-spec-validator (list ;; These tests attempt to fetch resources from the Internet #:test-flags '(list "--ignore-glob=tests/integration/validation/**" - "-k" "not example") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'remove-coverage-pytest-options - (lambda _ - (substitute* "pyproject.toml" - (("^--cov.*") ""))))))) + "-k" "not example"))) (native-inputs (list python-poetry-core python-pytest)) @@ -2264,9 +2245,6 @@ (define-public python-openapi-core (list #:test-flags '(list "tests/unit" - ;; Ignore Pytest configuration in setup.cfg that adds - ;; unwanted flake8 and coverage options. - "-c" "/dev/null" "-k" (string-append ;; Type mismatches "not TestFlaskOpenAPIRequest" @@ -5892,14 +5870,6 @@ (define-public python-tinycss2 (sha256 (base32 "0zyc48vbmczpqj7f3f0d7zb3bz29fyj50dg0m6bbwbr5i88kq3sq")))) (build-system pyproject-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-before 'check 'remove-unwanted-dependencies - (lambda _ - (substitute* "pyproject.toml" - (("^addopts.*") ""))))))) (propagated-inputs (list python-webencodings)) (native-inputs @@ -5926,17 +5896,6 @@ (define-public python-cssselect2 (sha256 (base32 "1j2fcr217rsvkipsg6zjq03rl64rxnvb5hqqpx0dv58fhspvkywk")))) (build-system pyproject-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-linters - ;; Their check fails; none of our business. - (lambda _ - (substitute* '("setup.py" "pyproject.toml") - (("'pytest-flake8',") "") - (("'pytest-isort',") "") - (("--flake8") "") - (("--isort") ""))))))) (propagated-inputs (list python-tinycss2)) (native-inputs diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1069f6292f8..7bcd4c299c3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21318,9 +21318,7 @@ (define-public python-cattrs (substitute* "pyproject.toml" ;; Fix version string (("dynamic = \\[\"version\"\\]") - (string-append "version = \"" #$version "\"")) - ;; Just run pytest with no frills - (("addopts = \"-l.*") ""))))))) + (string-append "version = \"" #$version "\"")))))))) (native-inputs (list python-hatchling python-hatch-vcs