Subject: [PATCH v3 27/28] build-system/pyproject: Stop hiding options.

From: Nicolas Graves <[email-masked]>
Date: Fri, 31 Jan 2025 03:03:27 +0100

* 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-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)[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.
---
 gnu/packages/pdf.scm           |  6 +-----
 gnu/packages/python-crypto.scm |  1 -
 gnu/packages/python-web.scm    | 34 +++-------------------------------
 gnu/packages/python-xyz.scm    |  4 +---
 4 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index f1e72ecc57..a1671e12c1 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -805,9 +805,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
@@ -1669,8 +1666,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 a29d7e4375..b62cc5c7d1 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -292,7 +292,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 2f7a1af4d5..695df26396 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1200,8 +1200,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 "Exceptions from Trio nursery"
               "not (test_lifespan_manager[trio-None-None-StartupFailed]"
@@ -2176,10 +2175,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
@@ -2934,10 +2930,6 @@ (define-public python-openapi-schema-validator
       '(list "-k" "not test_array_prefixitems_invalid")
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'remove-coverage-pytest-options
-            (lambda _
-              (substitute* "pyproject.toml"
-                (("^--cov.*") ""))))
           ;; See https://github.com/python-openapi/openapi-schema-validator/issues/204
           (add-after 'unpack 'relax-requirements
             (lambda _
@@ -2981,13 +2973,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))
@@ -3026,9 +3012,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" "not test_chars_valid")))
     (native-inputs (list python-django
                          python-falcon
@@ -7009,17 +6992,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 7ed8cf2824..59def98c44 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -22744,9 +22744,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 "\"")))))
           ;; XXX Our python-hypothesis package is too old.
           (add-after 'unpack 'compatibility
             (lambda _
-- 
2.48.1