[bug#70855] [PATCH 00/92] python-team patches

[bug#70855] [PATCH 00/92] python-team patches

[Nicolas Graves via Guix-patches via]

This patch series contains prerequisite patches for an upcoming series
to remove unwanted python nativeinputs. It should go to the
python-team branch, and contains various types of fixes or updates.

Please feel free to rewrite commit messages or amend patches for a minor change.

Nicolas Graves (92):
  gnu: python-seaborn: Correct dependencies.
  gnu: python-transient: Move to pyproject-build-system.
  gnu: python-black: Move to pyproject-build-system.
  gnu: python-isort: Move to pyproject-build-system.
  gnu: python-codespell: Improve package style.
  gnu: python-mutagen: Move to pyproject-build-system.
  gnu: python-http-ece: Update to 1.2.0.
  gnu: python-zope-i18nmessageid: Update to 5.1.1.
  gnu: python-aionotify: Update to 0.3.0.
  gnu: vdirsyncer: Move to pyproject-build-system and enable tests.
  gnu: python-django-localflavor: Move to pyproject-build-system.
  gnu: python-docker-pycreds: Move to pyproject-build-system.
  gnu: Add xcffibgen.
  gnu: Add ghc-language-python.
  gnu: python-xcffib: Move to (gnu packages xorg).
  gnu: qtile: Update to 0.23.0.
  gnu: qtile: Improve package style.
  gnu: sshuttle: Move to pyproject-build-system.
  gnu: python-apiron: Move to pyproject-build-system.
  gnu: python-alembic: Move to pyproject-build-system.
  gnu: conda: Move to pyproject-build-system.
  gnu: conda: Reindent.
  gnu: python-conda-package-handling: Move to pyproject-build-system.
  gnu: python-scikit-rf: Fix tests.
  gnu: gunicorn: Move to pyproject-build-system.
  gnu: python-arrow: Move to pyproject-build-system.
  gnu: dynaconf: Improve package style.
  gnu: zulip-term: Move to pyproject-build-system.
  gnu: python-pypujs: Improve package style.
  gnu: python-dateutil: Move to pyproject-build-system.
  gnu: python-nbval: Move to pyproject-build-system.
  gnu: python-asdf-astropy: Fix build.
  gnu: python-pytest-runner: Improve package style.
  gnu: gunicorn: Update to 21.2.0.
  gnu: python-unidecode: Update to 1.3.8.
  gnu: python-cbor2: Move to pyproject-build-system.
  gnu: python-tinycss: Move to pyproject-build-system.
  gnu: behave: Move to pyproject-build-system.
  gnu: python-cucumber-tag-expressions: Move to pyproject-build-system.
  gnu: python-flask-login: Move to pyproject-build-system.
  gnu: python-parse-type: Move to pyproject-build-system.
  gnu: python-amqp: Move to pyproject-build-system.
  gnu: python-cbor: Update home-page.
  gnu: python-sphinx: Ignore failing tests.
  gnu: python-sphinx-autodoc-typehints: Move to pyproject-build-system.
  gnu: abjad: Update to 3.19.
  gnu: abjad-ext-rmakers: Update to 3.19.
  gnu: abjad-ext-nauert: Update to 3.19.
  gnu: python-pytest-remotedata: Ignore failing test.
  gnu: python-pytest-toolbox: Move to pyproject-build-system.
  gnu: python-cairosvg: Move to pyproject-build-system.
  gnu: python-docspec-python: Move to pyproject-build-system.
  gnu: python-jaraco-classes: Move to pyproject-build-system.
  gnu: python-jaraco-context: Move to pyproject-build-system.
  gnu: python-jaraco-functools: Move to pyproject-build-system.
  gnu: python-jaraco-packaging: Move to pyproject-build-system.
  gnu: python-jaraco-test: Move to pyproject-build-system.
  gnu: python-nbstripout: Move to pyproject-build-system.
  gnu: Add ghc-xcb-types.
  gnu: python-sparse: Move to pyproject-build-system.
  gnu: python-pytest-enabler: Break dependency cycle.
  gnu: python-pint: Disable benchmark tests.
  gnu: python-apprise: Improve package style.
  gnu: python-autoflake: Update to 2.3.1.
  gnu: python-orderedmultidict: Move to pyproject-build-system.
  gnu: python-shtab: Move to pyproject-build-system.
  gnu: python-flake8-isort: Move to pyproject-build-system.
  gnu: python-xmltodict: Move to pyproject-build-system.
  gnu: python-rich: Update to 13.7.1.
  gnu: python-cmd2: Move to pyproject-build-system.
  gnu: Add python-sphinx-autodoc-typehints-5.
  gnu: python-uqbar: Improve package style.
  gnu: python-uqbar: Upgrade to python-team branch.
  gnu: python-uqbar: Update to 0.6.9.
  gnu: python-typeguard-4: Ignore failing tests.
  gnu: python-zope-i18nmessageid: Move to pyproject-build-system.
  gnu: python-funsor: Ignore flaky test.
  gnu: borgmatic: Move to pyproject-build-system.
  gnu: tuir: Move to pyproject-build-system.
  gnu: python-pytest-trio: Move to pyproject-build-system.
  gnu: python-fenics-dijitso: Move to pyproject-build-system.
  gnu: python-pyan3: Move to pyproject-build-system.
  gnu: python-numpydoc: Move to pyproject-build-sytem.
  gnu: python-multidict: Move to pyproject-build-system.
  gnu: python-warcio: Move to pyproject-build-system.
  gnu: python-certauth: Move to pyproject-build-system.
  gnu: python-matplotlib: Ignore failing tests.
  gnu: python-qemu-qmp: Improve package style.
  gnu: python-qemu-qmp: Move to pyproject-build-system.
  gnu: python-cssselect2: Move to pyproject-build-system.
  gnu: python-notebook: Add python-jupyter-server native-input.
  build-system/pyproject: Add missing native-inputs.

 gnu/local.mk                                  |   2 -
 gnu/packages/astronomy.scm                    |  27 +-
 gnu/packages/backup.scm                       |  14 +-
 gnu/packages/bioinformatics.scm               |   9 +-
 gnu/packages/check.scm                        | 102 +--
 gnu/packages/databases.scm                    |   8 +-
 gnu/packages/dav.scm                          |  14 +-
 gnu/packages/django.scm                       |  23 +-
 gnu/packages/docker.scm                       |  18 +-
 gnu/packages/engineering.scm                  |   6 +
 gnu/packages/graphviz.scm                     |  31 +-
 gnu/packages/haskell-xyz.scm                  |  25 +
 gnu/packages/jupyter.scm                      |  33 +-
 gnu/packages/machine-learning.scm             |   6 +-
 gnu/packages/messaging.scm                    |  23 +-
 gnu/packages/music.scm                        |  69 +--
 gnu/packages/package-management.scm           | 216 ++++---
 .../python-aionotify-0.2.0-py3.8.patch        |  48 --
 .../patches/python-uqbar-python3.10.patch     |  23 -
 gnu/packages/python-check.scm                 | 122 ++--
 gnu/packages/python-crypto.scm                |   2 +-
 gnu/packages/python-science.scm               |   4 +-
 gnu/packages/python-web.scm                   | 186 +++---
 gnu/packages/python-xyz.scm                   | 585 ++++++------------
 gnu/packages/serialization.scm                |   4 +-
 gnu/packages/simulation.scm                   |  21 +-
 gnu/packages/sphinx.scm                       |  30 +-
 gnu/packages/syndication.scm                  |  21 +-
 gnu/packages/terminals.scm                    |   2 +-
 gnu/packages/time.scm                         |  49 +-
 gnu/packages/version-control.scm              |   2 +
 gnu/packages/virtualization.scm               |  39 +-
 gnu/packages/vpn.scm                          |  12 +-
 gnu/packages/wm.scm                           | 103 +--
 gnu/packages/xml.scm                          |   7 +-
 gnu/packages/xorg.scm                         | 101 +++
 36 files changed, 860 insertions(+), 1127 deletions(-)
 delete mode 100644 gnu/packages/patches/python-aionotify-0.2.0-py3.8.patch
 delete mode 100644 gnu/packages/patches/python-uqbar-python3.10.patch

-- 
2.41.0

[bug#70855] [PATCH 01/92] gnu: python-seaborn: Correct dependencies.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-seaborn): Correct dependencies.
  [propagated-inputs]: Move python-ipykernel, python-mypy,
  python-nbconvert, python-numpydoc, python-pyyaml from here...
  [native-inputs]: ... to here.

Change-Id: I94a28f0cb8ec7c2171007f2b635dc10d7a8fcc8c
---
 gnu/packages/python-xyz.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 6fbc6f55591..c1590c2b568 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13834,22 +13834,22 @@ (define-public python-seaborn
                 "0ycibcs6kvd3xi4zsxna81claqifyb9dn6z6jwc5x7lqqplnbbdz"))))
     (build-system pyproject-build-system)
     (propagated-inputs
-     (list python-ipykernel
-           python-matplotlib
-           python-mypy
-           python-nbconvert
+     (list python-matplotlib
            python-numpy
-           python-numpydoc
            python-pandas
-           python-pyyaml
            python-scipy
            python-statsmodels))
     (native-inputs
      (list python-flake8
            python-flit-core
+           python-ipykernel
+           python-nbconvert
+           python-numpydoc
+           python-mypy
            python-pytest
            python-pytest-cov
-           python-pytest-xdist))
+           python-pytest-xdist
+           python-pyyaml))
     (home-page "https://seaborn.pydata.org/")
     (synopsis "Statistical data visualization")
     (description
-- 
2.41.0

[bug#70855] [PATCH 02/92] gnu: python-transient: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/virtualization.scm (python-transient)[build-system]:
Move to pyproject-build-system.

Change-Id: I29969738f862ea26fbaa9cb7642f98336f37c583
---
 gnu/packages/virtualization.scm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index da65b48dc27..c886c7489a7 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -32,6 +32,7 @@
 ;;; Copyright © 2023 Ahmad Draidi <a.r.draidi@redscript.org>
 ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2023, 2024 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -144,6 +145,7 @@ (define-module (gnu packages virtualization)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix build-system meson)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
   #:use-module (guix build-system ruby)
   #:use-module (guix build-system trivial)
@@ -2787,9 +2789,8 @@ (define-public python-transient
        (method url-fetch)
        (uri (pypi-uri "transient" version))
        (sha256
-        (base32
-         "148yiqrmcscsi6787y0f27i1y9cf0gcw3mqfv5frhpmsmv62mv5z"))))
-    (build-system python-build-system)
+        (base32 "148yiqrmcscsi6787y0f27i1y9cf0gcw3mqfv5frhpmsmv62mv5z"))))
+    (build-system pyproject-build-system)
     (arguments
      `(#:tests? #f ; Requires behave
        #:phases (modify-phases %standard-phases
@@ -2797,8 +2798,7 @@ (define-public python-transient
                     (lambda _
                       (substitute* "setup.py"
                         (("==")
-                         ">="))
-                      #t)))))
+                         ">=")))))))
     (propagated-inputs
      (list python-beautifultable
            python-click
@@ -2810,10 +2810,8 @@ (define-public python-transient
            python-toml))
     (native-inputs
      (list python-black python-mypy python-pyhamcrest python-twine))
-    (home-page
-     "https://github.com/ALSchwalm/transient")
-    (synopsis
-     "QEMU Wrapper written in Python")
+    (home-page "https://github.com/ALSchwalm/transient")
+    (synopsis "QEMU Wrapper written in Python")
     (description
      "@code{transient} is a wrapper for QEMU allowing the creation of virtual
 machines with shared folder, ssh, and disk creation support.")
-- 
2.41.0

[bug#70855] [PATCH 03/92] gnu: python-black: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* 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
-- 
2.41.0

[bug#70855] [PATCH 04/92] gnu: python-isort: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-isort):
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:test-flags>: Add option to replace former check phase.
  <#:phases>: Remove phases build, install and check.

Change-Id: Idac8f151977f2494eb44d51aa1fcbf3156b5cc87
---
 gnu/packages/python-xyz.scm | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 862efc0f5b5..c4b37270668 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -24322,19 +24322,13 @@ (define-public python-isort
        (sha256
         (base32
          "1vbwc4gpffclf6hw08lvvgqlvsgfjlw7gjsm28jfcrln2pixla7j"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      (list
+      #:test-flags '(list "tests/unit/" "-k" "not test_gitignore"
+                          "--ignore=tests/unit/test_deprecated_finders.py")
       #:phases
       #~(modify-phases %standard-phases
-          (replace 'build
-            (lambda _
-              (invoke "python" "-m" "build" "--wheel" "--no-isolation" ".")))
-          (replace 'install
-            (lambda _
-              (let ((whl (car (find-files "dist" "\\.whl$"))))
-                (invoke "pip" "--no-cache-dir" "--no-input"
-                        "install" "--no-deps" "--prefix" #$output whl))))
           (add-after 'install 'install-example-plugins
             (lambda _
               (for-each (lambda (source-directory)
@@ -24348,15 +24342,7 @@ (define-public python-isort
               (setenv "HOME" (getcwd))
               (let ((example-whls (find-files "dist" "^example.*\\.whl$")))
                 (apply invoke "pip" "--no-cache-dir" "--no-input"
-                       "install"  "--user" "--no-deps" example-whls))))
-          (replace 'check
-            (lambda* (#:key tests? inputs outputs #:allow-other-keys)
-              (when tests?
-                (let ((bin (string-append #$output "/bin")))
-                  (setenv "PATH" (string-append (getenv "PATH") ":" bin)))
-                (invoke "pytest" "-vv" "tests/unit/"
-                        "-k" "not test_gitignore" ;requires git
-                        "--ignore=tests/unit/test_deprecated_finders.py")))))))
+                       "install"  "--user" "--no-deps" example-whls)))))))
     (native-inputs
      (list python-black
            python-colorama
-- 
2.41.0

[bug#70855] [PATCH 05/92] gnu: python-codespell: Improve package style.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-codespell):
  [arguments]: Remove uneeded field.

Change-Id: I0d265e9c606730e8208376a7e0970d1c7a7d7a50
---
 gnu/packages/python-xyz.scm | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c4b37270668..a28e4e72f21 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -20190,17 +20190,6 @@ (define-public python-codespell
             python-tomli
             python-setuptools
             python-wheel))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key outputs tests? #:allow-other-keys)
-             (when tests?
-               ;; Make installed executable available for running the tests.
-               (setenv "PATH"
-                       (string-append (assoc-ref outputs "out") "/bin"
-                                      ":" (getenv "PATH")))
-               (invoke "pytest" "-vv")))))))
     (home-page "https://github.com/codespell-project/codespell/")
     (synopsis "Spellchecker for code")
     (description "Codespell fixes common misspellings in text files.
-- 
2.41.0

[bug#70855] [PATCH 06/92] gnu: python-mutagen: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/music.scm (python-mutagen):
  [build-system]: Move to pyproject-build-system.

Change-Id: Ic7790e4a17e3f0bdd7347eb668796aa4e0f61b0b
---
 gnu/packages/music.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 798aad11f72..38133cedc9e 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -4010,7 +4010,7 @@ (define-public python-mutagen
               (sha256
                (base32
                 "1qdk6i8gyhbi1c4j5jmbfpac3q8sff2ysri1pnp7nb9wzcp615v3"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      (list
        #:phases
-- 
2.41.0

[bug#70855] [PATCH 07/92] gnu: python-http-ece: Update to 1.2.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (python-http-ece): Update to 1.2.0.

Change-Id: I8d82959841b64db48eb01b88914298ba12f1a388
---
 gnu/packages/python-web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 3cebbbbe739..11fa240350c 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7330,7 +7330,7 @@ (define-public python-js2py
 (define-public python-http-ece
   (package
     (name "python-http-ece")
-    (version "1.1.0")
+    (version "1.2.0")
     (source
       (origin
         (method git-fetch)
@@ -7340,7 +7340,7 @@ (define-public python-http-ece
         (file-name (git-file-name name version))
         (sha256
          (base32
-          "0bp4cc0xc123i72h80ax3qz3ixfwx3j7pw343kc7i6kdvfi8klx7"))))
+          "11v9cpmx4jc0nk25af96plzjz3mg1ysm1m001nx6jns06hil1gpy"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
-- 
2.41.0

[bug#70855] [PATCH 08/92] gnu: python-zope-i18nmessageid: Update to 5.1.1.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (python-zope-i18nmessageid): Update to 5.1.1.

Change-Id: Ia53db09774addf05b0a856fd1f573c5dd5c902aa
---
 gnu/packages/python-web.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 11fa240350c..73f26bb9528 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3124,14 +3124,13 @@ (define-public python-zope-testrunner-bootstrap
 (define-public python-zope-i18nmessageid
   (package
     (name "python-zope-i18nmessageid")
-    (version "5.0.1")
+    (version "5.1.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "zope.i18nmessageid" version))
        (sha256
-        (base32
-         "0ndhn4w1qgwkfbwf9vm2bgq418z5g0wmfsgl0d9nz62cd0mi8d4m"))))
+        (base32 "14mx62khys82p2gmmf3m40x4jmvcz3rndvl6qik2n2qfp13n7ds7"))))
     (build-system python-build-system)
     (native-inputs
      (list python-coverage python-zope-testrunner))
-- 
2.41.0

[bug#70855] [PATCH 09/92] gnu: python-aionotify: Update to 0.3.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-aionotify): Update to 0.3.0.
  [build-system]: Move to pyproject-build-system.

* gnu/packages/patches/python-aionotify-0.2.0-py3.8.patch : Remove
patch.

* gnu/local.mk: Remove patch.

Change-Id: I9f13d6d71f69dd9877ac42e46b087989f23941e2
---
 gnu/local.mk                                  |  1 -
 .../python-aionotify-0.2.0-py3.8.patch        | 48 -------------------
 gnu/packages/python-xyz.scm                   | 13 +++--
 3 files changed, 6 insertions(+), 56 deletions(-)
 delete mode 100644 gnu/packages/patches/python-aionotify-0.2.0-py3.8.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 1f951d88ab1..9c61039239b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1920,7 +1920,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-3-search-paths.patch		\
   %D%/packages/patches/python-3-fix-tests.patch			\
   %D%/packages/patches/python-3-hurd-configure.patch		\
-  %D%/packages/patches/python-aionotify-0.2.0-py3.8.patch	\
   %D%/packages/patches/python-cross-compile.patch		\
   %D%/packages/patches/python-configobj-setuptools.patch	\
   %D%/packages/patches/python-dateutil-pytest-compat.patch	\
diff --git a/gnu/packages/patches/python-aionotify-0.2.0-py3.8.patch b/gnu/packages/patches/python-aionotify-0.2.0-py3.8.patch
deleted file mode 100644
index ebeef34720a..00000000000
--- a/gnu/packages/patches/python-aionotify-0.2.0-py3.8.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Compatibility with Python 3.8, see upstream issue
-https://github.com/rbarrois/aionotify/pull/15
-
-diff --git a/setup.py b/setup.py
-index 21a554f..094de64 100755
---- a/setup.py
-+++ b/setup.py
-@@ -40,7 +40,7 @@ setup(
-     setup_requires=[
-     ],
-     tests_require=[
--        'asynctest',
-+        'asynctest; python_version<"3.8"',
-     ],
-     classifiers=[
-         "Development Status :: 4 - Beta",
-diff --git a/tests/test_usage.py b/tests/test_usage.py
-index f156291..0476ff1 100644
---- a/tests/test_usage.py
-+++ b/tests/test_usage.py
-@@ -8,7 +8,11 @@ import os.path
- import tempfile
- import unittest
- 
--import asynctest
-+try:
-+    testBase = unittest.IsolatedAsyncioTestCase
-+except AttributeError:
-+    import asynctest
-+    testBase = asynctest.TestCase
- 
- import aionotify
- 
-@@ -25,11 +29,13 @@ if AIODEBUG:
- TESTDIR = os.environ.get('AIOTESTDIR') or os.path.join(os.path.dirname(__file__), 'testevents')
- 
- 
--class AIONotifyTestCase(asynctest.TestCase):
-+class AIONotifyTestCase(testBase):
-     forbid_get_event_loop = True
-     timeout = 3
- 
-     def setUp(self):
-+        if not getattr (self, 'loop', None):
-+            self.loop = asyncio.get_event_loop()
-         if AIODEBUG:
-             self.loop.set_debug(True)
-         self.watcher = aionotify.Watcher()
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a28e4e72f21..e1e8ef7caa0 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -30515,23 +30515,22 @@ (define-public python-cson
 (define-public python-aionotify
   (package
     (name "python-aionotify")
-    (version "0.2.0")
+    (version "0.3.0")
     (source
      (origin
        ;; Source tarball on PyPi lacks tests
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/rbarrois/aionotify")
-             (commit (string-append "v" version))))
+             (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1sk9i8czxgsbrswsf1nlb4c82vgnlzi8zrvrxdip92w2z8hqh43y"))
-       (patches (search-patches "python-aionotify-0.2.0-py3.8.patch"))))
-    (build-system python-build-system)
+        (base32 "0qkzwccv8k6mx1yvc0hmsgnzgb4vh8h97kq7i64ic6xzxkd57vkz"))))
+    (build-system pyproject-build-system)
     (home-page "https://github.com/rbarrois/aionotify")
-    (synopsis "Asyncio-powered inotify library")
+    (synopsis "inotify library for Python")
     (description
-     "@code{aionotify} is a simple, asyncio-based inotify library.")
+     "@code{python-aionotify} is a simple, asyncio-based inotify library.")
     (license license:bsd-3)))
 
 (define-public python-forbiddenfruit
-- 
2.41.0

[bug#70855] [PATCH 10/92] gnu: vdirsyncer: Move to pyproject-build-system and enable tests.

[Nicolas Graves via Guix-patches via]

* gnu/packages/dav.scm (vdirsyncer):
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:tests?>: Remove to enable tests.
  <#:test-flags>: Ignore test that require network connection.
  <#:phases>: Remove check phase replacement.

Change-Id: Iafccfc65e3a847a0eecc26c179f435b9ec1fdfec
---
 gnu/packages/dav.scm | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index ae034423746..b30b1ef5a59 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2021 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;; Copyright © 2022 Jonathan Brielmaier <jonathan.brielmaier@web.de>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,6 +24,7 @@
 
 (define-module (gnu packages dav)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix download)
   #:use-module (guix gexp)
   #:use-module (guix licenses)
@@ -124,20 +126,12 @@ (define-public vdirsyncer
              (sha256
               (base32
                "1fl21m10ghrpmkqa12g0qri99cxk9879pkb60jd4b4w2mgp8q1gx"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      (list
-      #:tests? #f                       ; the test suite is very flakey
+      #:test-flags '(list "-k" "not test_request_ssl")
       #:phases
       #~(modify-phases %standard-phases
-          (replace 'check
-            (lambda* (#:key inputs outputs tests? #:allow-other-keys)
-              (add-installed-pythonpath inputs outputs)
-              (setenv "DETERMINISTIC_TESTS" "true")
-              (setenv "DAV_SERVER" "radicale")
-              (setenv "REMOTESTORAGE_SERVER" "skip")
-              (if tests?
-                  (invoke "make" "test"))))
           (add-after 'unpack 'patch-version-call
             (lambda _
               (substitute* "docs/conf.py"
-- 
2.41.0

[bug#70855] [PATCH 11/92] gnu: python-django-localflavor: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-localflavor):
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:phases>: Rewrite check phase replacement.
             <#:test-flags>: Use it.
  [native-inputs]: Remove them. Not needed with the check phase
  rewrite.

Change-Id: Ie50baab2cb102585ee25e3264e00eebe370f4cb2
---
 gnu/packages/django.scm | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 6a373be3592..21099f0ff0f 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -283,20 +283,17 @@ (define-public python-django-localflavor
        (uri (pypi-uri "django-localflavor" version))
        (sha256
         (base32 "0i1s0ijfd9rv2cp5x174jcyjpwn7fyg7s1wpbvlwm96bpdvs6bxc"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
-             (when tests?
-               (add-installed-pythonpath inputs outputs)
-               (setenv "PYTHONPATH"
-                       (string-append ".:"
-                                      (getenv "GUIX_PYTHONPATH")))
-               (invoke "invoke" "test")))))))
-    (native-inputs
-     (list python-coverage python-invoke python-pytest-django which))
+     (list
+      #:test-flags '(list "--settings=tests.settings" "tests")
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key tests? test-flags #:allow-other-keys)
+              (if tests?
+                  (apply invoke "python" "-m" "django" "test" test-flags)
+                  (format #t "test suite not run~%")))))))
     (propagated-inputs
      (list python-django python-stdnum))
     (home-page "https://django-localflavor.readthedocs.io/en/latest/")
-- 
2.41.0

[bug#70855] [PATCH 12/92] gnu: python-docker-pycreds: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/docker.scm (python-docker-pycreds):
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:test-flags>: Use it.
  <#:phases>: Remove uneeded field.
  [native-inputs]: Remove python-pytest-cov and python-flake8. Add
  python-setuptools, python-wheel.

Change-Id: Idde93a366fa187d2af915ed15801da2cdbaa3792
---
 gnu/packages/docker.scm | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index b18de182fe5..de1baa15172 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com>
 ;;; Copyright © 2021, 2022 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -35,6 +36,7 @@ (define-module (gnu packages docker)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix utils)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
@@ -47,6 +49,7 @@ (define-module (gnu packages docker)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
@@ -151,19 +154,12 @@ (define-public python-docker-pycreds
         (sha256
          (base32
           "1m44smrggnqghxkqfl7vhapdw89m1p3vdr177r6cq17lr85jgqvc"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-versioning
-           (lambda _
-             (substitute* "test-requirements.txt"
-               (("3.0.2") ,(package-version python-pytest))
-               (("2.3.1") ,(package-version python-pytest-cov))
-               (("2.4.1") ,(package-version python-flake8)))
-             #t)))))
+     (list  ; XXX: These tests require docker credentials to run.
+      #:test-flags '(list "--ignore=tests/store_test.py")))
     (native-inputs
-     (list python-flake8 python-pytest python-pytest-cov))
+     (list python-pytest python-setuptools python-wheel))
     (propagated-inputs
      (list python-six))
     (home-page "https://github.com/shin-/dockerpy-creds")
-- 
2.41.0

[bug#70855] [PATCH 13/92] gnu: Add xcffibgen.

[Nicolas Graves via Guix-patches via]

* gnu/packages/xorg.scm (xcffibgen): New variable.

Change-Id: Ibcbacdfdeaa657ec1ded7dcc09c10c7fc2aa6717
---
 gnu/packages/xorg.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 74059a26910..fbe6375818f 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1673,6 +1673,39 @@ (define-public printproto
 network-transparent printing system.")
     (license license:x11)))
 
+(define xcffibgen
+  (package
+    (name "xcffibgen")
+    (version "1.4.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tych0/xcffib")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0wz6zlaqsmpw7ahaadpd7m5n5c5b2ya30xwsana4j5ljygdvzqp9"))))
+    (build-system haskell-build-system)
+    (native-inputs
+     (list ghc-hunit ghc-test-framework ghc-test-framework-hunit))
+    (inputs
+     (list libxcb
+           ghc
+           ghc-filemanip
+           ghc-split
+           ghc-language-python
+           ghc-attoparsec
+           ghc-either
+           ghc-optparse-applicative
+           ghc-xcb-types))
+    (home-page "https://github.com/tych0/xcffib")
+    (synopsis "Build tool for python-xcbffib bindings")
+    (description
+     "This is an internal package that provides a build tool to
+generate code for the @code{python-xcbffib} package.")
+    (license license:expat)))
+
 (define-public randrproto
   (package
     (name "randrproto")
-- 
2.41.0

[bug#70855] [PATCH 14/92] gnu: Add ghc-language-python.

[Nicolas Graves via Guix-patches via]

* gnu/packages/haskell-xyz.scm (ghc-language-python): New variable.

Change-Id: I29bcdedf155486673e01b3b6af71a2aa81455ef6
---
 gnu/packages/haskell-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index b5943f2f476..23af2a03bde 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -6397,6 +6397,31 @@ (define-public ghc-language-haskell-extract
 with @code{wc} (for a web service).")
     (license license:bsd-3)))
 
+(define-public ghc-language-python
+  (package
+    (name "ghc-language-python")
+    (version "0.5.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "language-python" version))
+       (sha256
+        (base32 "1mf3czvnh9582klv0c9g7pcn1wx4qjwpvhv8la6afaifv6y5lki2"))))
+    (build-system haskell-build-system)
+    (arguments
+     `(#:cabal-revision ("2"
+                         "024fn653gmxw4ndmqvg1d3lwmxbvrlllc9iw2zw0c3nkcgcv39sg")))
+    (native-inputs (list ghc-alex ghc-happy))
+    (inputs (list ghc-monads-tf ghc-utf8-string))
+    (home-page "http://github.com/bjpop/language-python")
+    (synopsis "Parse and pretty print Python code in Haskell")
+    (description
+     "@code{language-python} is a Haskell library for lexical analysis,
+parsing and pretty printing Python code.  It supports versions 2.x and 3.x of
+Python.")
+    (license license:bsd-3)
+    (properties '((upstream-name . "language-python")))))
+
 (define-public ghc-lens
   (package
     (name "ghc-lens")
-- 
2.41.0

[bug#70855] [PATCH 15/92] gnu: python-xcffib: Move to (gnu packages xorg).

[Nicolas Graves via Guix-patches via]

* /gnu/packages/python-xyz.scm (python-xcffib): Move from here…
* gnu/packages/xorg.scm (python-xcffib): …to here.

The package's build is fully rewritten and updated to version 1.5.0.

Change-Id: Ia77b9fc2160dacd77c3eaf4199278046a52515d7
---
 gnu/packages/python-xyz.scm | 44 -------------------------------------
 gnu/packages/xorg.scm       | 41 ++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 44 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e1e8ef7caa0..b34af56a1db 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11139,50 +11139,6 @@ (define-public python-manimpango
 ManimPango is internally used in Manim to render (non-LaTeX) text.")
     (license license:expat)))
 
-(define-public python-xcffib
-  (package
-    (name "python-xcffib")
-    (version "0.11.1")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (pypi-uri "xcffib" version))
-      (sha256
-       (base32
-        "0nkglsm9nbhv238iagmmsjcz6lf1yfdvp5kmspphdj385vz9r50j"))))
-    (build-system python-build-system)
-    (inputs
-     (list libxcb))
-    (propagated-inputs
-     (list python-cffi ; used at run time
-           python-six))
-    (arguments
-     `(;; FIXME: Tests need more work. See ".travis.yml" in the repository.
-       #:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-libxcb-path
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((libxcb (assoc-ref inputs "libxcb")))
-               (substitute* '("xcffib/__init__.py")
-                 (("soname = ctypes.util.find_library.*xcb.*")
-                  (string-append "soname = \"" libxcb "/lib/libxcb.so\"\n")))
-               #t)))
-         (add-after 'install 'install-doc
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((doc (string-append (assoc-ref outputs "out") "/share"
-                                       "/doc/" ,name "-" ,version)))
-               (mkdir-p doc)
-               (copy-file "README.md"
-                          (string-append doc "/README.md"))
-               #t))))))
-    (home-page "https://github.com/tych0/xcffib")
-    (synopsis "XCB Python bindings")
-    (description
-     "Xcffib is a replacement for xpyb, an XCB Python bindings.  It adds
-support for Python 3 and PyPy.  It is based on cffi.")
-    (license license:expat)))
-
 (define-public python-cairocffi
   (package
     (name "python-cairocffi")
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index fbe6375818f..2bc6946599c 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -65,6 +65,7 @@ (define-module (gnu packages xorg)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages aidc)
@@ -92,6 +93,7 @@ (define-module (gnu packages xorg)
   #:use-module (gnu packages image)
   #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages libedit)
+  #:use-module (gnu packages libffi)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages m4)
@@ -1706,6 +1708,45 @@ (define xcffibgen
 generate code for the @code{python-xcbffib} package.")
     (license license:expat)))
 
+(define-public python-xcffib
+  (package
+    (name "python-xcffib")
+    (version "1.5.0")
+    (source (package-source xcffibgen))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list pkg-config which xcb-proto xcffibgen))
+    (inputs
+     (list libxcb))
+    (propagated-inputs
+     (list python-cffi ; used at run time
+           python-six))
+    (arguments
+     (list
+      ;; Tests seem to require version 3.12 of Python.
+      #:tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'generate-bindings
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "Makefile"
+                (("^GEN=.*")
+                 (format #f "GEN=~a~%"
+                         (search-input-file inputs "/bin/xcffibgen"))))
+              (invoke "make" "xcffib")))
+          (add-before 'build 'fix-libxcb-path
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "xcffib/__init__.py"
+                (("ctypes\\.util\\.find_library\\(\"xcb\"\\)")
+                 (format #f "~s"
+                         (search-input-file inputs "/lib/libxcb.so.1")))))))))
+    (home-page "https://github.com/tych0/xcffib")
+    (synopsis "XCB Python bindings")
+    (description
+     "Xcffib is a replacement for xpyb, an XCB Python bindings.  It adds
+support for Python 3 and PyPy.  It is based on cffi.")
+    (license license:expat)))
+
 (define-public randrproto
   (package
     (name "randrproto")
-- 
2.41.0

[bug#70855] [PATCH 16/92] gnu: qtile: Update to 0.23.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/wm.scm (qtile): Update to 0.23.0.
  [build-system]: Upgrade to pyproject-build-system.
  [arguments]<#:phases>: Use gexp (but do not indent). Add phase
  pre-check.
  <#:test-flags>: Use it.
  [native-inputs]: Add python-pytest and
  xorg-server-for-tests. Reorder.

Change-Id: Id6f291c0d23fa2cef17d6e45552f45c56f162741
---
 gnu/packages/wm.scm | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index f2cb77f5bfd..3ae4d03839b 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -63,7 +63,7 @@
 ;;; Copyright © 2023 Gabriel Wicki <gabriel@erlikon.ch>
 ;;; Copyright © 2023 Jonathan Brielamier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2023 Vessel Wave <vesselwave@disroot.org>
-;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2023, 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2023, 2024 Jaeme Sifat <jaeme@runbox.com>
 ;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
 ;;; Copyright © 2024 Timotej Lazar <timotej.lazar@araneo.si>
@@ -101,6 +101,7 @@ (define-module (gnu packages wm)
   #:use-module (guix build-system haskell)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system perl)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
   #:use-module (guix utils)
@@ -594,19 +595,22 @@ (define-public python-i3-py
 (define-public qtile
   (package
     (name "qtile")
-    (version "0.18.1")
+    (version "0.23.0")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "qtile" version))
         (sha256
-          (base32 "14hb26xkza7brvkd4276j60mxd3zsas72ih6y0cq3j060izm1865"))))
-    (build-system python-build-system)
+          (base32 "1v8rxm2xg2igxv6gwa78wrkxzgfxmxfgflbjdp4fm7cxjdx3zrpa"))))
+    (build-system pyproject-build-system)
     (arguments
-     `(#:tests? #f ; Tests require Xvfb and writable temp/cache space
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-paths
+     (list
+      ;; A lot of tests fail despite Xvfb and writable temp/cache space.
+      #:tests? #f
+      #:test-flags '("--ignore=test/widgets/test_widget_init_configure.py")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-paths
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "libqtile/pangocffi.py"
                (("^gobject = ffi.dlopen.*")
@@ -626,7 +630,14 @@ (define-public qtile
                (mkdir-p xsessions)
                (copy-file "resources/qtile.desktop" (string-append xsessions "/qtile.desktop"))
                (substitute* (string-append xsessions "/qtile.desktop")
-                 (("qtile start") qtile))))))))
+                 (("qtile start") qtile)))))
+          (add-before 'check 'pre-check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (setenv "HOME" "/tmp")
+                (system "Xvfb :1 &")
+                (setenv "DISPLAY" ":1")
+                (setenv "XDG_CACHE_HOME" "/tmp")))))))
     (inputs
       (list glib pango pulseaudio))
     (propagated-inputs
@@ -643,9 +654,11 @@ (define-public qtile
       (list pkg-config
             python-flake8
             python-pep8-naming
-            python-psutil
+            python-pytest
             python-pytest-cov
-            python-setuptools-scm))
+            python-psutil
+            python-setuptools-scm
+            xorg-server-for-tests))
     (home-page "http://qtile.org")
     (synopsis "Hackable tiling window manager written and configured in Python")
     (description "Qtile is simple, small, and extensible.  It's easy to write
-- 
2.41.0

[bug#70855] [PATCH 17/92] gnu: qtile: Improve package style.

[Nicolas Graves via Guix-patches via]

* gnu/packages/wm.scm (qtile): Indent as needed. Light rewrite using
 format instead of string-append in [arguments]<#:phases>. Ensure
 lines wrap with intended length.

Change-Id: I297718138642d24604743137f3181bfc76a51b54
---
 gnu/packages/wm.scm | 72 +++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 3ae4d03839b..a1c94fe13a9 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -597,11 +597,11 @@ (define-public qtile
     (name "qtile")
     (version "0.23.0")
     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "qtile" version))
-        (sha256
-          (base32 "1v8rxm2xg2igxv6gwa78wrkxzgfxmxfgflbjdp4fm7cxjdx3zrpa"))))
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "qtile" version))
+       (sha256
+        (base32 "1v8rxm2xg2igxv6gwa78wrkxzgfxmxfgflbjdp4fm7cxjdx3zrpa"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -611,26 +611,28 @@ (define-public qtile
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-paths
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "libqtile/pangocffi.py"
-               (("^gobject = ffi.dlopen.*")
-                 (string-append "gobject = ffi.dlopen(\""
-                  (assoc-ref inputs "glib") "/lib/libgobject-2.0.so.0\")\n"))
-                (("^pango = ffi.dlopen.*")
-                 (string-append "pango = ffi.dlopen(\""
-                  (assoc-ref inputs "pango") "/lib/libpango-1.0.so.0\")\n"))
-                (("^pangocairo = ffi.dlopen.*")
-                 (string-append "pangocairo = ffi.dlopen(\""
-                  (assoc-ref inputs "pango") "/lib/libpangocairo-1.0.so.0\")\n")))))
-       (add-after 'install 'install-xsession
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (xsessions (string-append out "/share/xsessions"))
-                    (qtile (string-append out "/bin/qtile start")))
-               (mkdir-p xsessions)
-               (copy-file "resources/qtile.desktop" (string-append xsessions "/qtile.desktop"))
-               (substitute* (string-append xsessions "/qtile.desktop")
-                 (("qtile start") qtile)))))
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "libqtile/pangocffi.py"
+                (("^(gobject = ffi.dlopen).*" all def)
+                 (format #f "~a(~s)~%" def
+                         (search-input-file inputs "/lib/libgobject-2.0.so.0")))
+                (("^(pango = ffi.dlopen).*" all def)
+                 (format #f "~a(~s)~%" def
+                         (search-input-file inputs "/lib/libpango-1.0.so.0")))
+                (("^(pangocairo = ffi.dlopen).*" all def)
+                 (format #f "~a(~s)~%" def
+                         (search-input-file
+                          inputs "/lib/libpangocairo-1.0.so.0"))))))
+          (add-after 'install 'install-xsessions
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (xsessions (string-append out "/share/xsessions"))
+                     (qtile (string-append out "/bin/qtile start")))
+                (mkdir-p xsessions)
+                (copy-file "resources/qtile.desktop"
+                           (string-append xsessions "/qtile.desktop"))
+                (substitute* (string-append xsessions "/qtile.desktop")
+                  (("qtile start") qtile)))))
           (add-before 'check 'pre-check
             (lambda* (#:key tests? #:allow-other-keys)
               (when tests?
@@ -639,17 +641,17 @@ (define-public qtile
                 (setenv "DISPLAY" ":1")
                 (setenv "XDG_CACHE_HOME" "/tmp")))))))
     (inputs
-      (list glib pango pulseaudio))
+     (list glib pango pulseaudio))
     (propagated-inputs
-      (list python-cairocffi
-            python-cffi
-            python-dateutil
-            python-dbus-next
-            python-iwlib
-            python-keyring
-            python-mpd2
-            python-pyxdg
-            python-xcffib))
+     (list python-cairocffi
+           python-cffi
+           python-dateutil
+           python-dbus-next
+           python-iwlib
+           python-keyring
+           python-mpd2
+           python-pyxdg
+           python-xcffib))
     (native-inputs
       (list pkg-config
             python-flake8
-- 
2.41.0

[bug#70855] [PATCH 18/92] gnu: sshuttle: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/vpn.scm (sshuttle):
  [build-system]: Use pyproject-build-system.
  [arguments]: Delete field.

Change-Id: I4fd3cb99b281c22200b059586080e29851a8a74c
---
 gnu/packages/vpn.scm | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 7823ef19eb0..9da51cb5617 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -966,17 +966,7 @@ (define-public sshuttle
        (sha256
         (base32
          "0vp13xwrhx4m6zgsyzvai84lkq9mzkaw47j58dk0ll95kaymk2x8"))))
-    (build-system python-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-FHS-file-names
-           (lambda _
-             (substitute* "sshuttle/client.py"
-               (("/usr/bin/env") (which "env")))
-             (substitute* "sshuttle/ssh.py"
-               (("/bin/sh") "sh"))
-             #t)))))
+    (build-system pyproject-build-system)
     (native-inputs
      (list python-setuptools-scm
            ;; For tests only.
-- 
2.41.0

[bug#70855] [PATCH 19/92] gnu: python-apiron: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (python-apiron):
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:phases>: Replace field with <#:test-flags>.

Change-Id: I04bb9739b6356fd50fc07ae54838764d51ed22d6
---
 gnu/packages/python-web.scm | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 73f26bb9528..fd9d49e2e2f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3554,16 +3554,9 @@ (define-public python-apiron
        (uri (pypi-uri "apiron" version))
        (sha256
         (base32 "1qwbqn47sf0aqznj1snbv37v8ijx476qqkjf5l9pac7xjkxsr8qk"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (add-installed-pythonpath inputs outputs)
-             (invoke "pytest" "-vv" "--cov" "-k"
-                     ;; This test tries to connect to the internet.
-                     "not test_call"))))))
+     (list #:test-flags '(list "-k" "not test_call")))
     (propagated-inputs
      (list python-requests))
     (native-inputs
-- 
2.41.0

[bug#70855] [PATCH 20/92] gnu: python-alembic: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/databases.scm (python-alembic):
  [build-system]: Move to pyproject-build-system.
  [arguments]: Remove field, now uneeded.

Change-Id: I5907ff84412d867d094aae5fb4daa8481eb7f30c
---
 gnu/packages/databases.scm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index b519bc4fb5d..a3a550c40c3 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3762,12 +3762,7 @@ (define-public python-alembic
        (uri (pypi-uri "alembic" version))
        (sha256
         (base32 "0lxi2g2025lz5k7k5dd5fc1lfijqi2yw6qqyjzp073z6laa8cckw"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (replace 'check
-                    (lambda _
-                      (invoke "pytest" "-vv"))))))
+    (build-system pyproject-build-system)
     (native-inputs
      (list python-mock python-pytest-cov))
     (propagated-inputs
-- 
2.41.0

[bug#70855] [PATCH 21/92] gnu: conda: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/package-management.scm (conda): Improve package style.
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:test-flags>: Use field instead of check phase
  replacement.
  <#:phases>: Remove check phase replacement. Improve use of format in
  phase do-not-use-python-root-as-prefix. Use gexp. Put phase init
  after phase create-entrypoints.

Change-Id: Id1affbf8f80fae2882e4c8a88b1e817cf49a5c00
---
 gnu/packages/package-management.scm | 104 +++++++++++++---------------
 1 file changed, 50 insertions(+), 54 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index f4c2cf91492..8a47135ad02 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1170,10 +1170,49 @@ (define-public conda
        (sha256
         (base32
          "16vz4vx311ry9w35mi5wna8p8n3abd6wdqrpqzjfdlwv7hcr44s4"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
+     (list
+      #:test-flags
+      '(list
+        "--ignore=tests/cli/test_main_clean.py"
+        "--ignore=tests/cli/test_main_rename.py"
+        "-k" (string-append
+              "not "
+              (string-join
+               (list
+                "integration"
+                ;; This one reports a newer version of conda than
+                ;; expected; conda-1.5.2-py27_0 instead of
+                ;; conda-1.3.5-py27_0.
+                "test_auto_update_conda"
+                ;; This fails because the output directory is not a
+                ;; Conda environment.
+                "test_list"
+                ;; This fails because we patched the default root
+                ;; prefix.
+                "test_default_target_is_root_prefix"
+                ;; This fails because of missing features in python-flaky.
+                "test_no_features"
+                ;; These fail because they require network access
+                "test_no_ssl"
+                "test_run_readonly_env"
+                "test_run_returns_int"
+                "test_run_returns_nonzero_errorlevel"
+                "test_run_returns_zero_errorlevel"
+                "test_run_uncaptured"
+
+                ;; TODO: I don't understand what this failure means
+                "test_PrefixData_return_value_contract"
+                ;; TODO: same here
+                "test_install_1"
+                ;; Not sure if this is really wrong.  This fails because
+                ;; /gnu/store/...conda-22.9.0/bin/python
+                ;; is not /gnu/store/...python-wrapper-3.9.9/bin/python
+                "test_make_entry_point")
+               " and not ")))
+      #:phases
+     #~(modify-phases %standard-phases
          ;; The default version of pytest does not support these options.
          (add-after 'unpack 'use-older-pytest
            (lambda _
@@ -1186,10 +1225,6 @@ (define-public conda
          (add-after 'unpack 'correct-python-executable-name
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((python (assoc-ref inputs "python-wrapper")))
-               #;
-               (substitute* "conda/common/path.py"
-                 (("python_version or ''")
-                  "python_version or '3'"))
                (substitute* "conda/core/initialize.py"
                  (("python_exe = join")
                   (format #f "python_exe = \"~a/bin/python\" #"
@@ -1200,19 +1235,19 @@ (define-public conda
                    (python (assoc-ref inputs "python-wrapper")))
                (substitute* "tests/core/test_initialize.py"
                  (("\"\"\"\\) % conda_prefix")
-                  (format #f "\"\"\") % \"~a\"" python))
+                  (format #f "\"\"\") % ~s" python))
                  (("CONDA_PYTHON_EXE \"%s\"' % join\\(conda_prefix")
-                  (format #f "CONDA_PYTHON_EXE \"%s\"' % join(\"~a\""
+                  (format #f "CONDA_PYTHON_EXE \"%s\"' % join(~s"
                           python))
                  (("conda_prefix = abspath\\(sys.prefix\\)")
-                  (format #f "conda_prefix = abspath(\"~a\")" out)))
+                  (format #f "conda_prefix = abspath(~s)" out)))
                (substitute* "conda/base/context.py"
                  (("os.chdir\\(sys.prefix\\)")
-                  (format #f "os.chdir(\"~a\")" out))
+                  (format #f "os.chdir(~s)" out))
                  (("sys.prefix, '.condarc'")
-                  (format #f "\"~a\", '.condarc'" out))
+                  (format #f "~s, '.condarc'" out))
                  (("return abspath\\(sys.prefix\\)")
-                  (format #f "return abspath(\"~a\")" out))
+                  (format #f "return abspath(~s)" out))
                  (("os.path.join\\(sys.prefix, bin_dir, exe\\)")
                   (format #f "\"~a/bin/conda\"" out))
                  (("'CONDA_EXE', sys.executable")
@@ -1220,47 +1255,8 @@ (define-public conda
          (add-before 'build 'create-version-file
            (lambda _
              (with-output-to-file "conda/.version"
-               (lambda () (display ,version)))))
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             ;; These tests all require network access.
-             (for-each delete-file '("tests/cli/test_main_clean.py"
-                                     "tests/cli/test_main_rename.py"))
-             (when tests?
-               (setenv "HOME" "/tmp")
-               (invoke "py.test" "-vv"
-                       "-k"
-                       (string-append
-                        "not integration"
-                        ;; This one reports a newer version of conda than
-                        ;; expected; conda-1.5.2-py27_0 instead of
-                        ;; conda-1.3.5-py27_0.
-                        " and not test_auto_update_conda"
-                        ;; This fails because the output directory is not a
-                        ;; Conda environment.
-                        " and not test_list"
-                        ;; This fails because we patched the default root
-                        ;; prefix.
-                        " and not test_default_target_is_root_prefix"
-                        ;; This fails because of missing features in python-flaky.
-                        " and not test_no_features"
-                        ;; These fail because they require network access
-                        " and not test_no_ssl"
-                        " and not test_run_readonly_env"
-                        " and not test_run_returns_int"
-                        " and not test_run_returns_nonzero_errorlevel"
-                        " and not test_run_returns_zero_errorlevel"
-                        " and not test_run_uncaptured"
-
-                        ;; TODO: I don't understand what this failure means
-                        " and not test_PrefixData_return_value_contract"
-                        ;; TODO: same here
-                        " and not test_install_1"
-                        ;; Not sure if this is really wrong.  This fails because
-                        ;; /gnu/store/...conda-22.9.0/bin/python
-                        ;; is not /gnu/store/...python-wrapper-3.9.9/bin/python
-                        " and not test_make_entry_point")))))
-         (add-after 'install 'init
+               (lambda () (display #$version)))))
+         (add-after 'create-entrypoints 'init
            ;; This writes a whole bunch of shell initialization files to the
            ;; prefix directory.  Many features of conda can only be used after
            ;; running "conda init".
-- 
2.41.0

[bug#70855] [PATCH 22/92] gnu: conda: Reindent.

[Nicolas Graves via Guix-patches via]

* gnu/packages/package-management.scm (conda): Reindent.

Change-Id: I954ec137b4dc39cd561da9ed0e583991bb3de1db
---
 gnu/packages/package-management.scm | 112 ++++++++++++++--------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 8a47135ad02..a01c9faab13 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1164,8 +1164,8 @@ (define-public conda
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/conda/conda")
-              (commit version)))
+             (url "https://github.com/conda/conda")
+             (commit version)))
        (file-name (git-file-name name version))
        (sha256
         (base32
@@ -1212,60 +1212,60 @@ (define-public conda
                 "test_make_entry_point")
                " and not ")))
       #:phases
-     #~(modify-phases %standard-phases
-         ;; The default version of pytest does not support these options.
-         (add-after 'unpack 'use-older-pytest
-           (lambda _
-             (substitute* "setup.cfg"
-               (("--xdoctest-.*") ""))))
-         (add-after 'unpack 'fix-ruamel-yaml-dependency
-           (lambda _
-             (substitute* "setup.py"
-               (("ruamel_yaml_conda") "ruamel.yaml"))))
-         (add-after 'unpack 'correct-python-executable-name
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((python (assoc-ref inputs "python-wrapper")))
-               (substitute* "conda/core/initialize.py"
-                 (("python_exe = join")
-                  (format #f "python_exe = \"~a/bin/python\" #"
-                          python))))))
-         (add-after 'unpack 'do-not-use-python-root-as-prefix
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out"))
-                   (python (assoc-ref inputs "python-wrapper")))
-               (substitute* "tests/core/test_initialize.py"
-                 (("\"\"\"\\) % conda_prefix")
-                  (format #f "\"\"\") % ~s" python))
-                 (("CONDA_PYTHON_EXE \"%s\"' % join\\(conda_prefix")
-                  (format #f "CONDA_PYTHON_EXE \"%s\"' % join(~s"
-                          python))
-                 (("conda_prefix = abspath\\(sys.prefix\\)")
-                  (format #f "conda_prefix = abspath(~s)" out)))
-               (substitute* "conda/base/context.py"
-                 (("os.chdir\\(sys.prefix\\)")
-                  (format #f "os.chdir(~s)" out))
-                 (("sys.prefix, '.condarc'")
-                  (format #f "~s, '.condarc'" out))
-                 (("return abspath\\(sys.prefix\\)")
-                  (format #f "return abspath(~s)" out))
-                 (("os.path.join\\(sys.prefix, bin_dir, exe\\)")
-                  (format #f "\"~a/bin/conda\"" out))
-                 (("'CONDA_EXE', sys.executable")
-                  (format #f "'CONDA_EXE', \"~a/bin/conda\"" out))))))
-         (add-before 'build 'create-version-file
-           (lambda _
-             (with-output-to-file "conda/.version"
-               (lambda () (display #$version)))))
-         (add-after 'create-entrypoints 'init
-           ;; This writes a whole bunch of shell initialization files to the
-           ;; prefix directory.  Many features of conda can only be used after
-           ;; running "conda init".
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (add-installed-pythonpath inputs outputs)
-             (setenv "HOME" "/tmp")
-             (invoke (string-append (assoc-ref outputs "out")
-                                    "/bin/conda")
-                     "init"))))))
+      #~(modify-phases %standard-phases
+          ;; The default version of pytest does not support these options.
+          (add-after 'unpack 'use-older-pytest
+            (lambda _
+              (substitute* "setup.cfg"
+                (("--xdoctest-.*") ""))))
+          (add-after 'unpack 'fix-ruamel-yaml-dependency
+            (lambda _
+              (substitute* "setup.py"
+                (("ruamel_yaml_conda") "ruamel.yaml"))))
+          (add-after 'unpack 'correct-python-executable-name
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((python (assoc-ref inputs "python-wrapper")))
+                (substitute* "conda/core/initialize.py"
+                  (("python_exe = join")
+                   (format #f "python_exe = \"~a/bin/python\" #"
+                           python))))))
+          (add-after 'unpack 'do-not-use-python-root-as-prefix
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let ((out (assoc-ref outputs "out"))
+                    (python (assoc-ref inputs "python-wrapper")))
+                (substitute* "tests/core/test_initialize.py"
+                  (("\"\"\"\\) % conda_prefix")
+                   (format #f "\"\"\") % ~s" python))
+                  (("CONDA_PYTHON_EXE \"%s\"' % join\\(conda_prefix")
+                   (format #f "CONDA_PYTHON_EXE \"%s\"' % join(~s"
+                           python))
+                  (("conda_prefix = abspath\\(sys.prefix\\)")
+                   (format #f "conda_prefix = abspath(~s)" out)))
+                (substitute* "conda/base/context.py"
+                  (("os.chdir\\(sys.prefix\\)")
+                   (format #f "os.chdir(~s)" out))
+                  (("sys.prefix, '.condarc'")
+                   (format #f "~s, '.condarc'" out))
+                  (("return abspath\\(sys.prefix\\)")
+                   (format #f "return abspath(~s)" out))
+                  (("os.path.join\\(sys.prefix, bin_dir, exe\\)")
+                   (format #f "\"~a/bin/conda\"" out))
+                  (("'CONDA_EXE', sys.executable")
+                   (format #f "'CONDA_EXE', \"~a/bin/conda\"" out))))))
+          (add-before 'build 'create-version-file
+            (lambda _
+              (with-output-to-file "conda/.version"
+                (lambda () (display #$version)))))
+          (add-after 'create-entrypoints 'init
+            ;; This writes a whole bunch of shell initialization files to the
+            ;; prefix directory.  Many features of conda can only be used after
+            ;; running "conda init".
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (add-installed-pythonpath inputs outputs)
+              (setenv "HOME" "/tmp")
+              (invoke (string-append (assoc-ref outputs "out")
+                                     "/bin/conda")
+                      "init"))))))
     (inputs
      (list python-wrapper))
     (propagated-inputs
-- 
2.41.0

[bug#70855] [PATCH 23/92] gnu: python-conda-package-handling: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/package-management.scm (python-conda-package-handling):
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:phases>: Remove check phase replacement.

Change-Id: Ib8edf966b877c6fd5f7ee6151839d4272d65b17d
---
 gnu/packages/package-management.scm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index a01c9faab13..949c42e274b 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1130,18 +1130,14 @@ (define-public python-conda-package-handling
        (sha256
         (base32
          "1dq6f5ks3cinb355x712bls9bvv6bli6x3c43sdkqvawdw8xgv9j"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'use-unmodified-libarchive
            (lambda _
              (substitute* "setup.py"
-               (("archive_and_deps") "archive"))))
-         (replace 'check
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (add-installed-pythonpath inputs outputs)
-             (invoke "pytest" "-vv" "tests"))))))
+               (("archive_and_deps") "archive")))))))
     (propagated-inputs
      (list python-six python-tqdm))
     (inputs
-- 
2.41.0

[bug#70855] [PATCH 24/92] gnu: python-scikit-rf: Fix tests.

[Nicolas Graves via Guix-patches via]

* gnu/packages/engineering.scm (python-scikit-rf): Fix tests.
  [arguments]: Set <#:test-flags> to ignore failing tests.

Change-Id: I404b221dc9c1f15e045226196cc43d86b8796b6a
---
 gnu/packages/engineering.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 13e1b595814..f082f346278 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2663,6 +2663,12 @@ (define-public python-scikit-rf
                 "1cidv2373lwxy26kbzg4slaqvn2gpq67mvijgp0rydfx6mm6a89i"))
               (file-name (git-file-name name version))))
     (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-flags '(list ;; Missing docscrape dependency.
+                          "--ignore=doc/sphinxext/tests/test_docscrape.py"
+                          ;; these test require network
+                          "--ignore=skrf/tests/test_network.py")))
     (propagated-inputs (list python-matplotlib
                              python-networkx
                              python-numpy
-- 
2.41.0

[bug#70855] [PATCH 25/92] gnu: gunicorn: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (gunicorn): Improve package style.
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:phases>: Remove check phase replacement, now in
  <#:test-flags>. Use gexp. Remove wrap phase replacement (will not be
  needed after merge of 25235).

Change-Id: I83e09cd0a22c0a5d249e50af199c5c648e53aa65
---
 gnu/packages/python-web.scm | 41 ++++++++++---------------------------
 1 file changed, 11 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index fd9d49e2e2f..494b11422f3 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6064,29 +6064,25 @@ (define-public gunicorn
         (base32
          "1s7670qw36x90bgmazmgib170i5gnpyb2ypxzlla7y0mpasniag0"))))
     (outputs '("out" "doc"))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
+     (list
+      #:test-flags '(list
+                     ;; Disable the geventlet tests because eventlet uses
+                     ;; dnspython, which does not work in the build
+                     ;; container due to lack of /etc/resolv.conf, etc.
+                     "--ignore=tests/workers/test_geventlet.py")
+      #:phases
+      #~(modify-phases %standard-phases
          (add-after 'build 'build-doc
            (lambda _
              (invoke "make" "-C" "docs" "PAPER=a4" "html" "info")
              (delete-file "docs/build/texinfo/Makefile")
              (delete-file "docs/build/texinfo/Gunicorn.texi")))
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (if tests?
-                 (begin
-                   (invoke "pytest" "-vv"
-                           ;; Disable the geventlet tests because eventlet uses
-                           ;; dnspython, which does not work in the build
-                           ;; container due to lack of /etc/resolv.conf, etc.
-                           "--ignore=tests/workers/test_geventlet.py"))
-                 (format #t "test suite not run~%"))))
          (add-after 'install 'install-doc
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((doc (string-append (assoc-ref outputs "doc")
-                                        "/share/doc/" ,name "-" ,version))
+                                        "/share/doc/" #$name "-" #$version))
                     (html (string-append doc "/html"))
                     (info (string-append doc "/info"))
                     (examples (string-append doc "/examples")))
@@ -6098,22 +6094,7 @@ (define-public gunicorn
                (copy-recursively "examples" examples)
                (for-each (lambda (file)
                            (copy-file file (string-append doc "/" file)))
-                         '("README.rst" "NOTICE" "LICENSE" "THANKS")))))
-         ;; XXX: The wrap phase includes native inputs on PYTHONPATH, (see
-         ;; <https://bugs.gnu.org/25235>), leading to an inflated closure
-         ;; size.  Override it to only add the essential entries.
-         (replace 'wrap
-           (lambda* (#:key native-inputs inputs outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (python (assoc-ref (or native-inputs inputs) "python"))
-                    (sitedir (string-append "/lib/python"
-                                            (python-version python)
-                                            "/site-packages")))
-               (wrap-program (string-append out "/bin/gunicorn")
-                 `("PYTHONPATH" ":" prefix
-                   ,(map (lambda (output)
-                           (string-append output sitedir))
-                         (list python out))))))))))
+                         '("README.rst" "NOTICE" "LICENSE" "THANKS"))))))))
     (native-inputs
      (list binutils ;; for ctypes.util.find_library()
            python-aiohttp
-- 
2.41.0

[bug#70855] [PATCH 26/92] gnu: python-arrow: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/time.scm (python-arrow): Improve package style.
  [build-system]: Move to pyproject-build-system.
  [arguments]: Moving check replacement phase from <#:phases> to
  equivalent <#:test-flags>.

Change-Id: I7e3d356610d624855c3898ccdbfb308ce9f6e627
---
 gnu/packages/time.scm | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm
index 5e20f05fb6c..96fe9f561a0 100644
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@ -507,17 +507,13 @@ (define-public python-arrow
               (sha256
                (base32
                 "189knrgxb3x21lzvqac6qlpd32308hcmpccxdlvr5wmrl46b6d1r"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "pytest" "-vv" "tests"
-                       ;; python-dateutil doesn't recognize America/Nuuk.
-                       ;; Remove when python-dateutil > 2.8.1.
-                       "-k" "not test_parse_tz_name_zzz")))))))
+     (list
+      #:test-flags '(list "tests"
+                          ;; python-dateutil doesn't recognize America/Nuuk.
+                          ;; Remove when python-dateutil > 2.8.1.
+                          "-k" "not test_parse_tz_name_zzz")))
     (native-inputs
      (list ;; For testing
            python-chai
-- 
2.41.0

[bug#70855] [PATCH 27/92] gnu: dynaconf: Improve package style.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (dynaconf): Improve package-style and
  ignore coverage tests.
  [origin](snippet): More concise snippet. Remove coverage management.
  [arguments]<#:test-flags>: Add arguments from former check
  replacement phase.
  <#:phases>: Remove check replacement phase.

Change-Id: I2a0e0a8dea5000aecc05707c35d307c867c96709
---
 gnu/packages/python-xyz.scm | 42 +++++++++++++------------------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b34af56a1db..0863ce8fa01 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -34900,43 +34900,29 @@ (define-public dynaconf
          "0fj2ffvzfvjf4d7f672h5x5fzq26f8hax9j3dfsix158fwm0212w"))
        (patches (search-patches "dynaconf-unvendor-deps.patch"))
        (modules '((guix build utils)))
-       (snippet '(begin
-                   ;; Remove vendored dependencies
-                   (let ((unvendor '("click" "dotenv" "ruamel" "toml")))
-                     (with-directory-excursion "dynaconf/vendor"
-                       (for-each delete-file-recursively unvendor)))
-                   ;; Lower coverage quality gate for unit tests
-                   (substitute* ".coveragerc"
-                     (("fail_under = 95") "fail_under = 50"))))))
+       ;; Remove vendored dependencies
+       (snippet '(let ((unvendor '("click" "dotenv" "ruamel" "toml")))
+                   (with-directory-excursion "dynaconf/vendor"
+                     (for-each delete-file-recursively unvendor))))))
     (build-system pyproject-build-system)
     (arguments
      `(#:test-flags
-       '("-k"
-         ,(let ((click-tests '("test_negative_get"
-                               "test_inspect_invalid_format")))
-            ;; Disable integration tests
-            (string-append "not integration and not "
-                           ;; These tests fail because we use Click 8.* instead of
-                           ;; Click 7
-                           (string-join click-tests " and not "))))
+       '("--ignore=tests/test_vault.py"  ; depend on hvac and a live Vault
+         "-k" ,(let ((click-tests '("test_negative_get"
+                                    "test_inspect_invalid_format")))
+                 ;; Disable integration tests
+                 (string-append "not integration and not "
+                                ;; These tests fail because we use Click 8.*
+                                ;; instead of Click 7
+                                (string-join click-tests " and not ")))
+         "tests")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-for-click-8
            (lambda _
              (substitute* "dynaconf/cli.py"
                (("click.get_os_args\\()") ;deprecated from Click 8.1+
-                "sys.argv[1:]"))))
-         (replace 'check
-           (lambda* (#:key tests? test-flags #:allow-other-keys)
-             (when tests?
-               ;; These tests depend on hvac and a live Vault process.
-               (delete-file "tests/test_vault.py")
-               (apply invoke
-                      `("py.test" ,@test-flags "-v"
-                        "--cov-config" ".coveragerc"
-                        "--cov=dynaconf"
-                        "-l" "--tb=short"
-                        "--maxfail=1" "tests/"))))))))
+                "sys.argv[1:]")))))))
     (propagated-inputs
      (list python-click python-configobj python-dotenv-0.13.0
            python-ruamel.yaml-0.16 python-toml python-tomli))
-- 
2.41.0

[bug#70855] [PATCH 28/92] gnu: zulip-term: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/messaging.scm (zulip-term):
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:test-flags>: Use it in place of check phase replacement.

Change-Id: Ia5be66a35b92d9a9229f450a7724e27167c02eda
---
 gnu/packages/messaging.scm | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 497808b069f..cb72bfb3e25 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -3211,24 +3211,13 @@ (define-public zulip-term
         (base32
          "1xhhy3v4wck74a83avil0rnmsi2grrh03cww19n5mv80p2q1cjmf"))
        (modules '((guix build utils)))
-       (snippet
-        '(begin
-           (substitute* "setup.py"
-             (("\\=\\=1\\.7") ">=1.7")  ; pytest-mock
-             (("\\=\\=2\\.5") ">=2.5")  ; pytest-cov
-             (("4\\.5\\.2") "4.4.2"))   ; lxml
-           #t))))
-    (build-system python-build-system)
+       (snippet '(substitute* "setup.py"
+                   (("\\=\\=1\\.7") ">=1.7")    ; pytest-mock
+                   (("\\=\\=2\\.5") ">=2.5")    ; pytest-cov
+                   (("4\\.5\\.2") "4.4.2")))))  ; lxml
+    (build-system pyproject-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               ;; Delete failing tests.
-               (delete-file "tests/cli/test_run.py")
-               (invoke "pytest"))
-             #t)))))
+     '(#:test-flags '("--ignore=tests/cli/test_run.py")))
     (inputs
      (list python-beautifulsoup4
            python-lxml
-- 
2.41.0

[bug#70855] [PATCH 29/92] gnu: python-pypujs: Improve package style.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-pypujs): Improve package style.
  [arguments]<#:test-flags>: Use it in place of check phase
  replacement.
  <#:phases>: Clarify phase disable-pyramid.

Change-Id: If8073cc4e9a8a86003000e7157985fe382de7b4f
---
 gnu/packages/python-xyz.scm | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0863ce8fa01..6d6169ec1e1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6453,18 +6453,13 @@ (define-public python-pypugjs
     (build-system pyproject-build-system)
     (arguments
      (list
+      #:test-flags '(list "pypugjs/testsuite/")
       #:phases #~(modify-phases %standard-phases
-                   ;; Our pyramid is outdated and pyramid-mako is not packaged.
                    (add-after 'unpack 'disable-pyramid
-                     (lambda* (#:key inputs #:allow-other-keys)
-                       (substitute* "setup.py"
-                         (("'pyramid")
-                          "#'pyramid"))))
-                   (replace 'check
-                     (lambda* (#:key tests? #:allow-other-keys)
-                       (when tests?
-                         (invoke "python" "-m" "pytest" "-v"
-                                 "pypugjs/testsuite/")))))))
+                     (lambda _
+                       ;; pyramid is outdated and pyramid-mako is unpackaged.
+                       (substitute* "setup.cfg"
+                         (("'(pyramid|pyramid-mako)[^']*',") "")))))))
     (native-inputs (list python-coverage
                          python-django
                          python-jinja2
-- 
2.41.0

[bug#70855] [PATCH 30/92] gnu: python-dateutil: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/time.scm (python-dateutil): Improve package style.
  [build-system]: Move to pyproject-build-system.
  [arguments]: Use <#:test-flags> instead of check phase replacement.

Change-Id: I252fbe47f04ba6a2fbcc497565cbf6e352f9d06c
---
 gnu/packages/time.scm | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm
index 96fe9f561a0..552ac346c4a 100644
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@ -242,22 +242,15 @@ (define-public python-dateutil
        (uri (pypi-uri "python-dateutil" version))
        (patches (search-patches "python-dateutil-pytest-compat.patch"))
        (sha256
-        (base32
-         "11iy7m4bp2lgfkcl0r6xzf34bvk7ppjmsyn2ygfikbi72v6cl8q1"))))
-    (build-system python-build-system)
+        (base32 "11iy7m4bp2lgfkcl0r6xzf34bvk7ppjmsyn2ygfikbi72v6cl8q1"))))
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (replace 'check
-                    (lambda _
-                      ;; Delete tests that depend on "freezegun" to avoid a
-                      ;; circular dependency.
-                      (delete-file "dateutil/test/test_utils.py")
-                      (delete-file "dateutil/test/test_rrule.py")
-
-                      ;; XXX: Fails to get timezone from /etc/localtime.
-                      (delete-file "dateutil/test/test_tz.py")
-
-                      (invoke "pytest" "-vv"))))))
+     (list
+      #:test-flags '(list  ; avoid freezegun dependency
+                     "--ignore=dateutil/test/test_utils.py"
+                     "--ignore=dateutil/test/test_rrule.py"
+                     ;; XXX: Fails to get timezone from /etc/localtime.
+                     "--ignore=dateutil/test/test_tz.py")))
     (native-inputs
      (list python-pytest python-pytest-cov python-setuptools-scm))
     (propagated-inputs
-- 
2.41.0

[bug#70855] [PATCH 31/92] gnu: python-nbval: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* 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
-- 
2.41.0

[bug#70855] [PATCH 32/92] gnu: python-asdf-astropy: Fix build.

[Nicolas Graves via Guix-patches via]

* gnu/packages/astronomy.scm (python-asdf-astropy):
  [arguments]<#:test-flags>: Remove uneeded faulty field.

Change-Id: I8708e91db28de10f390d9c40a6c667eec33bf362
---
 gnu/packages/astronomy.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 44a953379b4..de5193d9b83 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -4942,8 +4942,6 @@ (define-public python-asdf-astropy
     (build-system pyproject-build-system)
     (arguments
      (list
-      #:test-flags
-      #~(list "-n" "auto")
       #:phases #~(modify-phases %standard-phases
                    (add-before 'check 'set-home-env
                      (lambda _ (setenv "HOME" "/tmp"))))))
-- 
2.41.0

[bug#70855] [PATCH 33/92] gnu: python-pytest-runner: Improve package style.

[Nicolas Graves via Guix-patches via]

* gnu/packages/check.scm (python-pytest-runner):
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:phases>: Remove check phase replacement. Update
  <#:tests?> refusal comment.
  [native-inputs]: Add python-pip, python-pypa-build,
  python-setuptools and python-wheel.

Change-Id: Id36e7ed4a3cec6098f0877f48f3fbcbd8007f3c3
---
 gnu/packages/check.scm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 15d2910603b..5708fa91acd 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1640,10 +1640,10 @@ (define-public python-pytest-runner
        (sha256
         (base32
          "11dnhxnjmh4nf1j8rnvx944ha3wg8ggrgrwdcx4c7d19xmi57n5l"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      (list
-      ;; FIXME: The test suite requires 'python-flake8' and 'python-black',
+      ;; FIXME: The test suite requires 'python-pytest-virtualenv',
       ;; but that introduces a circular dependency.
       #:tests? #f
       #:phases
@@ -1657,14 +1657,10 @@ (define-public python-pytest-runner
             (lambda _
               (let ((whl (car (find-files "dist" "\\.whl$"))))
                 (invoke "pip" "--no-cache-dir" "--no-input"
-                        "install" "--no-deps" "--prefix" #$output whl))))
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (if tests?
-                  (invoke "pytest" "-vv")
-                  (format #t "test suite not run~%")))))))
+                        "install" "--no-deps" "--prefix" #$output whl)))))))
     (native-inputs
-     (list python-pypa-build python-setuptools-scm python-wheel))
+     (list python-pip python-pypa-build python-pytest
+           python-setuptools python-setuptools-scm python-wheel))
     (home-page "https://github.com/pytest-dev/pytest-runner")
     (synopsis "Invoke py.test as a distutils command")
     (description
-- 
2.41.0

[bug#70855] [PATCH 34/92] gnu: gunicorn: Update to 21.2.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (gunicorn): Update to 21.2.0.

Change-Id: Ia9931763ff45ee8e3f925ce54c20bce6549d809a
---
 gnu/packages/python-web.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 494b11422f3..dc868102572 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6055,14 +6055,13 @@ (define-public python-uvloop
 (define-public gunicorn
   (package
     (name "gunicorn")
-    (version "20.1.0")
+    (version "21.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "gunicorn" version))
        (sha256
-        (base32
-         "1s7670qw36x90bgmazmgib170i5gnpyb2ypxzlla7y0mpasniag0"))))
+        (base32 "0cqhr2g880snpi45qvvch288m4fdyd5vqrcz3gk9hkv33pzqpv48"))))
     (outputs '("out" "doc"))
     (build-system pyproject-build-system)
     (arguments
-- 
2.41.0

[bug#70855] [PATCH 35/92] gnu: python-unidecode: Update to 1.3.8.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-unidecode): Update to 1.3.8.
  [build-system]: Move to pyproject-build-system.

Change-Id: I6e31f7af905bb2a024e8a7f7112732bcadbdf739
---
 gnu/packages/python-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 6d6169ec1e1..ab325e5e35e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5968,14 +5968,14 @@ (define-public python-rollbar
 (define-public python-unidecode
   (package
     (name "python-unidecode")
-    (version "1.1.1")
+    (version "1.3.8")
     (source (origin
              (method url-fetch)
              (uri (pypi-uri "Unidecode" version))
              (sha256
               (base32
-               "1s6cp2lv4m0f00hjckjz8p6m7d3n3v16jvg353llf5ia1iqsnsib"))))
-    (build-system python-build-system)
+               "1x620s4dk4d501pivhlfzbi2d1r5fnm9cssqwkn76f7d8sfk9nyg"))))
+    (build-system pyproject-build-system)
     (home-page "https://pypi.org/project/Unidecode/")
     (synopsis "ASCII transliterations of Unicode text")
     (description
-- 
2.41.0

[bug#70855] [PATCH 36/92] gnu: python-cbor2: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (python-cbor2):
  [build-system]: Move to pyproject-build-system.
  [arguments]: Remove uneeded field.

Change-Id: I2e27fa48950aa9d10e140bfbdc12df3d22661282
---
 gnu/packages/python-web.scm | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index dc868102572..aa04a02bad5 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1000,15 +1000,7 @@ (define-public python-cbor2
        (uri (pypi-uri "cbor2" version))
        (sha256
         (base32 "15y78xcc3zkmvj1mdzz8gyhf3apbl91073kwhzbjk5abc1civwlw"))))
-    (build-system python-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "pytest" "-vv")))))))
+    (build-system pyproject-build-system)
     (native-inputs (list python-pytest python-pytest-cov python-setuptools-scm))
     (home-page "https://github.com/agronholm/cbor2")
     (synopsis "Concise Binary Object Representation (CBOR) (de)serializer")
-- 
2.41.0

[bug#70855] [PATCH 37/92] gnu: python-tinycss: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (python-tinycss):
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:test-flags>: Ignore failing test.

Change-Id: I972a3c6390df5f8af79c952292db8a4e24a4aa33
---
 gnu/packages/python-web.scm | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index aa04a02bad5..88dc08c18f6 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5874,20 +5874,10 @@ (define-public python-tinycss
        (uri (pypi-uri "tinycss" version))
        (sha256
         (base32 "0vkifr595h28ymkjhrswwf0bm23lhznh5f44xyp7x7jy1ssnyc0j"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'disable-flake8-isort
-           ;; Flake8 and isort tests fail.
-           (lambda _
-             (substitute* "setup.cfg" ((" --flake8 --isort") ""))
-             #t))
-         (replace 'check
-           (lambda _
-             ;; Disable failing test.
-             (invoke "python" "-m" "pytest" "-k"
-                     "not test_speedups"))))))
+     (list #:test-flags
+           '(list "-k" "not test_speedups")))
     (native-inputs
      (list python-pytest-cov python-pytest-flake8 python-pytest-isort
            python-pytest-runner))
-- 
2.41.0

[bug#70855] [PATCH 38/92] gnu: behave: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/check.scm (behave):
  [build-system]: Move to pyproject-build-system.
  [arguments]: Remove uneeded field.

Change-Id: I9ea513fb49b71d9187461ef55c2a6ecab2844a1d
---
 gnu/packages/check.scm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 5708fa91acd..1d0be03d406 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2990,13 +2990,7 @@ (define-public behave
               (sha256
                (base32
                 "0sv94wagi214h0l91zn8m04f78x5wn83vqxib81hnl1qahvx9hq7"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (replace 'check
-                    (lambda* (#:key tests? #:allow-other-keys)
-                      (when tests?
-                        (invoke "pytest" "-c" "/dev/null" "-vv")))))))
+    (build-system pyproject-build-system)
     (native-inputs
      (list python-mock python-nose python-pathpy python-pyhamcrest
            python-pytest))
-- 
2.41.0

[bug#70855] [PATCH 39/92] gnu: python-cucumber-tag-expressions: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-check.scm (python-cucumber-tag-expressions):
  [build-system]: Move to pyproject-build-system.
  [arguments]: Remove uneeded field.

Change-Id: Ibf0d92aa761f7a00f8c2c806a8bbd38669987ad7
---
 gnu/packages/python-check.scm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 8e2164a82db..a3eecba5495 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -262,16 +262,7 @@ (define-public python-cucumber-tag-expressions
        (uri (pypi-uri "cucumber-tag-expressions" version))
        (sha256
         (base32 "0q7rn4l4ppjd1zsglr37ccc5xccg4iigaw827282zfzfsvzda573"))))
-    (build-system python-build-system)
-    (arguments
-     (list #:phases
-           #~(modify-phases %standard-phases
-               (replace 'check
-                 (lambda* (#:key tests? #:allow-other-keys)
-                   (when tests?
-                     ;; Ignore the configuration file since we don't
-                     ;; need HTML reports, etc.
-                     (invoke "pytest" "-c" "/dev/null" "-vv")))))))
+    (build-system pyproject-build-system)
     (native-inputs
      (list python-invoke python-pathpy python-pytest))
     (home-page "https://github.com/cucumber/tag-expressions-python")
-- 
2.41.0

[bug#70855] [PATCH 40/92] gnu: python-flask-login: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (python-flask-login):
  [build-system]: Move to pyproject-build-system.
  [arguments]: Remove uneeded field.

Change-Id: I9f3abb36b642ad2860c68f13f9d9e8b8b5f40811
---
 gnu/packages/python-web.scm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 88dc08c18f6..4d3fc75bb3c 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4856,14 +4856,7 @@ (define-public python-flask-login
        (file-name (git-file-name name version))
        (sha256
         (base32 "12yw01ccgjn9c88cbkrd6k1ykjxd8fxip2b1isvxjirphnlqhn9g"))))
-    (build-system python-build-system)
-    (arguments
-     (list #:phases
-           #~(modify-phases %standard-phases
-               (replace 'check
-                 (lambda* (#:key tests? #:allow-other-keys)
-                   (when tests?
-                     (invoke "pytest" "-vv" "-c" "/dev/null")))))))
+    (build-system pyproject-build-system)
     (propagated-inputs
      (list python-flask))
     (native-inputs
-- 
2.41.0

[bug#70855] [PATCH 41/92] gnu: python-parse-type: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-parse-type):
  [build-system]: Move to pyproject-build-system.
  [arguments]: Remove uneeded field.

Change-Id: Iccb3303996480bef3c151559884d1a8c488385cd
---
 gnu/packages/python-xyz.scm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ab325e5e35e..169c1df2112 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4766,14 +4766,7 @@ (define-public python-parse-type
        (sha256
         (base32
          "07smqnzc9km7sbvxfyx4gdm9njrx58x8grdw6gs4gva81rk3rd10"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "pytest" "-vv" "-c" "/dev/null")))))))
+    (build-system pyproject-build-system)
     (propagated-inputs (list python-six python-parse))
     (native-inputs (list python-pytest))
     (home-page "https://github.com/jenisys/parse_type")
-- 
2.41.0

[bug#70855] [PATCH 42/92] gnu: python-amqp: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-amqp):
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:phases>: Remove unneeded field.
  <#:test-flags>: Ignore failing test.

Change-Id: I8fb99db7fbd6c669a929b95829f9db2fea0691a5
---
 gnu/packages/python-xyz.scm | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 169c1df2112..1d324af423e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -19620,18 +19620,10 @@ (define-public python-amqp
        (uri (pypi-uri "amqp" version))
        (sha256
         (base32 "1qmmffiy48nady7is8529vxcyqbq88v5zgawqr3fk4q8rkz166rc"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "pytest" "-vv"
-                        "-c" "/dev/null" ;take control over pytest options
-                        ;; Integration tests require network connectivity.
-                        "--ignore" "t/integration")))))))
+     (list  ; Integration tests require network connectivity.
+      #:test-flags '(list "--ignore=t/integration")))
     (native-inputs (list python-pytest))
     (propagated-inputs (list python-vine))
     (home-page "https://github.com/celery/py-amqp")
-- 
2.41.0

[bug#70855] [PATCH 43/92] gnu: python-cbor: Update home-page.

[Nicolas Graves via Guix-patches via]

* gnu/packages/serialization.scm (python-cbor): Update home-page.
  [build-system]: Move to pyproject-build-system.

Change-Id: I0262007ae19813b89f42eb21c388d41362638a4f
---
 gnu/packages/serialization.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 6c784896ec3..728d6404bb9 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -834,8 +834,8 @@ (define-public python-cbor
        (sha256
         (base32
          "1dmv163cnslyqccrybkxn0c9s1jk1mmafmgxv75iamnz5lk5l8hk"))))
-    (build-system python-build-system)
-    (home-page "https://bitbucket.org/bodhisnarkva/cbor")
+    (build-system pyproject-build-system)
+    (home-page "https://github.com/brianolson/cbor_py")
     (synopsis "Implementation of the Concise Binary Object Representation")
     (description
      "Python-cbor provides an implementation of the Concise Binary Object
-- 
2.41.0

[bug#70855] [PATCH 44/92] gnu: python-sphinx: Ignore failing tests.

[Nicolas Graves via Guix-patches via]

* gnu/packages/sphinx.scm (python-sphinx-5):
  [arguements]<#:test-flags>: Ignore failing tests.

Change-Id: Ic57905e247a693107a31efc36048025879119ebe
---
 gnu/packages/sphinx.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 651c5d5b581..ea643040fbf 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -174,7 +174,10 @@ (define-public python-sphinx-5
               "not test_latex_images"
               ;; XXX: Not clear why this fails with a version comparison
               ;; failure.
-              " and not test_needs_sphinx"))
+              " and not test_needs_sphinx"
+              " and not test_viewcode"
+              " and not test_additional_targets_should_not_be_translated"
+              " and not test_additional_targets_should_be_translated"))
       #:phases
       '(modify-phases %standard-phases
          (add-before 'check 'pre-check
-- 
2.41.0

[bug#70855] [PATCH 45/92] gnu: python-sphinx-autodoc-typehints: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/sphinx.scm (python-sphinx-autodoc-typehints):
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:phases>: Move 'check phase replacement...
  ... to argument <#:test-flags>.

Change-Id: I2b41dffd5ee35442e1bb42f426bff69e17648785
---
 gnu/packages/sphinx.scm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index ea643040fbf..195cd63ae61 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -1135,9 +1135,12 @@ (define-public python-sphinx-autodoc-typehints
        (sha256
         (base32
          "049dlay21f4bccig31fkbzq2m8v0h6g63p1cn3dxay9q3h0mzgs0"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      (list
+      ;; This test requires to download an objects.inv file
+      ;; from the Sphinx website.
+      #:test-flags '(list "-k" "not test_format_annotation")
       #:phases
       #~(modify-phases %standard-phases
           (add-before 'build 'pretend-version
@@ -1145,14 +1148,7 @@ (define-public python-sphinx-autodoc-typehints
             ;; without the git metadata available, the version string is set to
             ;; '0.0.0'.
             (lambda _
-              (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)))
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "pytest" "-vv" "tests"
-                        ;; This test requires to download an objects.inv file
-                        ;; from the Sphinx website.
-                        "-k" "not test_format_annotation")))))))
+              (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version))))))
     (propagated-inputs (list python-sphinx))
     (native-inputs
      (list python-nptyping
-- 
2.41.0

[bug#70855] [PATCH 46/92] gnu: abjad: Update to 3.19.

[Nicolas Graves via Guix-patches via]

* gnu/packages/music.scm (abjad): Update to 3.19.
  [arguments]: Remove uneeded field.
  [native-inputs]: Remove all native-inputs except python-pytest.

Change-Id: Iad5b855734650d15dd0a2a8db6312e8d9a3de24a
---
 gnu/packages/music.scm | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 38133cedc9e..b5895b9a494 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1684,8 +1684,7 @@ (define-public music21
 (define-public abjad
   (package
     (name "abjad")
-    ;; XXX: The latest version which supports current Guix's Python 3.9.9.
-    (version "3.4")
+    (version "3.19")
     (source
      (origin
        (method git-fetch)
@@ -1694,36 +1693,12 @@ (define-public abjad
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0s63vk9fifp0im9c31kb9ck39mbaxhrls993d8fvg0nkg41z1jnz"))))
+        (base32 "1cgcnmwzxx2hr21pqm1hbsknpad748yw3gf7jncsb3w1azhjypzm"))))
     (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          ;; XXX. Permit newer version of uqbar, remove for >3.4. Remove in
-          ;; the next update.
-          (add-after 'unpack 'loosen-requirements
-            (lambda _
-              (substitute* "setup.py"
-                ((", <0\\.5\\.0") ""))))
-          ;; FIXME: Check why it's failing with this: Note: compilation failed
-          ;; and \version outdated, did you update input syntax with
-          ;; convert-ly?
-          (add-before 'check 'disable-failing-tests
-            (lambda _
-              (substitute* "tests/test_ext_sphinx.py"
-                (("def test_ext_sphinx_01") "def __off_test_ext_sphinx_01")))))))
     (inputs
      (list lilypond))
     (native-inputs
-     (list python-flake8
-           python-isort
-           python-mypy
-           python-pytest
-           python-pytest-cov
-           python-pytest-helpers-namespace
-           python-six
-           python-sphinx-autodoc-typehints))
+     (list python-pytest))
     (propagated-inputs
      (list python-quicktions
            python-ply
-- 
2.41.0

[bug#70855] [PATCH 47/92] gnu: abjad-ext-rmakers: Update to 3.19.

[Nicolas Graves via Guix-patches via]

* gnu/packages/music.scm (abjad-ext-rmakers): Update to 3.19.
  [native-inputs]: Remove all native-inputs except lilypond and
  python-pytest.

Change-Id: I83f7d8c93d7f764ddc8416239873f4126fa66ce6
---
 gnu/packages/music.scm | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index b5895b9a494..eb2fc5edf0a 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1718,7 +1718,7 @@ (define-public abjad
 (define-public abjad-ext-rmakers
   (package
     (name "abjad-ext-rmakers")
-    (version "3.4")
+    (version "3.19")
     (source
      (origin
        (method git-fetch)
@@ -1727,20 +1727,10 @@ (define-public abjad-ext-rmakers
          (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0wma9vzn42h1rhbzh2dwjsrzjhsi1yqdgn6wx1dfk78vaki6prd8"))))
+        (base32 "1y8s55b4mlsigm0xkk6qjpp08c75rv0swvjp0lj3cs6lgqdjxdjl"))))
     (build-system pyproject-build-system)
     (native-inputs
-     (list lilypond
-           python-black
-           python-flake8
-           python-iniconfig
-           python-isort
-           python-mypy
-           python-pytest
-           python-pytest-cov
-           python-pytest-helpers-namespace
-           python-sphinx-autodoc-typehints))
+     (list lilypond python-pytest))
     (propagated-inputs
      (list abjad))
     (home-page "https://abjad.github.io")
-- 
2.41.0

[bug#70855] [PATCH 48/92] gnu: abjad-ext-nauert: Update to 3.19.

[Nicolas Graves via Guix-patches via]

* gnu/packages/music.scm (abjad-ext-nauert): Update to 3.19.
  [native-inputs]: Remove all native-inputs except lilypond and
  python-pytest.

Change-Id: I593fa8e8f3af25cfdd0d8bc476d8c37245f23c33
---
 gnu/packages/music.scm | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index eb2fc5edf0a..37fe94b56de 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1743,7 +1743,7 @@ (define-public abjad-ext-rmakers
 (define-public abjad-ext-nauert
   (package
     (name "abjad-ext-nauert")
-    (version "3.4")
+    (version "3.19")
     (source
      (origin
        (method git-fetch)
@@ -1752,20 +1752,10 @@ (define-public abjad-ext-nauert
          (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "05hr2lr6myzi493k8vc19cqzraxxnbdwlckwbnras19l5g5ns38x"))))
+        (base32 "0j4pf4h27jm3df0dn2rwkdx6zqcxvr7pqchbaa9rffz7q4hbakmf"))))
     (build-system pyproject-build-system)
     (native-inputs
-     (list lilypond
-           python-black
-           python-flake8
-           python-iniconfig
-           python-isort
-           python-mypy
-           python-pytest
-           python-pytest-cov
-           python-pytest-helpers-namespace
-           python-sphinx-autodoc-typehints))
+     (list lilypond python-pytest))
     (propagated-inputs
      (list abjad))
     (home-page "https://abjad.github.io")
-- 
2.41.0

[bug#70855] [PATCH 49/92] gnu: python-pytest-remotedata: Ignore failing test.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-check.scm (python-pytest-remotedata)
  [arguments]<#:test-flags>: Ignore failing tests.

Change-Id: Ic351559a0c9ce49be6ce4695cceef46f8b6384ba
---
 gnu/packages/python-check.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index a3eecba5495..f2a355bb413 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -840,6 +840,7 @@ (define-public python-pytest-remotedata
      (list
       #:test-flags #~(list "-k" (string-append
                                  "not test_default_behavior"
+                                 " and not test_strict_behavior"
                                  " and not test_strict_with_decorator"))))
     (native-inputs
      (list python-pytest python-setuptools python-setuptools-scm
-- 
2.41.0

[bug#70855] [PATCH 50/92] gnu: python-pytest-toolbox: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-check.scm (python-pytest-toolbox):
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:phases>: Restrict 'check phase replacement to
  'pre-check phase.

Change-Id: Id0804db32d30314076d1e411711881bbe3a3f6e1
---
 gnu/packages/python-check.scm | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index f2a355bb413..ccda2042fb6 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1481,18 +1481,16 @@ (define-public python-pytest-toolbox
        (file-name (git-file-name name version))
        (sha256
         (base32 "1wqkr3g5gmqdxmhzfsxbwy8pm3cadaj6a8cxq58w9bacly4hqbh0"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? inputs outputs #:allow-other-keys)
-             (when tests?
-               (substitute* "setup.cfg"
-                 ((".*timeout.*") ""))
-               ;; Make the installed plugin discoverable by Pytest.
-               (add-installed-pythonpath inputs outputs)
-               (invoke "pytest" "-vv")))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'pre-check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (substitute* "setup.cfg"
+                  ((".*timeout.*") ""))))))))
     (native-inputs
      (list python-pydantic python-pytest python-pytest-isort))
     (home-page "https://github.com/samuelcolvin/pytest-toolbox")
-- 
2.41.0

[bug#70855] [PATCH 51/92] gnu: python-cairosvg: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-cairosvg):
  [build-system]: Move to pyproject-build-system.
  [arguments]: Remove field.

Change-Id: Ibf6d045ddaea5f6a83c70fea2c307f25a9fed730
---
 gnu/packages/python-xyz.scm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1d324af423e..facad6c8689 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -29751,12 +29751,7 @@ (define-public python-cairosvg
        (uri (pypi-uri "CairoSVG" version))
        (sha256
         (base32 "1ylsisha2cc4w0yydxwhy7idkfw1inl9fsipxsrm7vyby080vi9z"))))
-    (build-system python-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda _ (invoke "pytest"))))))
+    (build-system pyproject-build-system)
     (propagated-inputs
      (list python-cairocffi python-cssselect2 python-defusedxml
            python-pillow python-tinycss2))
-- 
2.41.0

[bug#70855] [PATCH 52/92] gnu: python-docspec-python: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-docspec-python):
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:phases>: Remove uneeded field.

Change-Id: Ib728c442a130eecebe4dff1e364d997bcca76076
---
 gnu/packages/python-xyz.scm | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index facad6c8689..323bbfc1b4d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -812,16 +812,8 @@ (define-public python-docspec-python
         (base32 "0n8m52vxmlvkj7p5jmd4rfdks65rrp4q4vzak44y6kbg9l5qa6y4"))))
     (build-system pyproject-build-system)
     (arguments
-     (list
-      #:tests? #false  ;there are none
-      #:phases
-      '(modify-phases %standard-phases
-         (add-after 'unpack 'relax-requirements
-           (lambda _
-             ;; We don't have black 23.
-             (substitute* "pyproject.toml"
-               (("23.1.0") "22.3.0")))))))
-    (propagated-inputs (list python-black python-docspec python-nr-util))
+     (list #:tests? #false))  ;there are none
+    (propagated-inputs (list python-docspec python-nr-util))
     (native-inputs (list python-poetry-core))
     (home-page "https://github.com/NiklasRosenstein/docspec/")
     (synopsis "Produce docspec data from Python source code")
-- 
2.41.0

[bug#70855] [PATCH 53/92] gnu: python-jaraco-classes: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-jaraco-classes):
  [build-system]: Move to pyproject-build-system.
  [arguments]: Convert <#:phases> to <#:test-flags>.

Change-Id: I8fbe633db7533f933a342b47a4a2191ccf13a8c5
---
 gnu/packages/python-xyz.scm | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 323bbfc1b4d..32991d57a1f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11722,17 +11722,10 @@ (define-public python-jaraco-classes
        (uri (pypi-uri "jaraco.classes" version))
        (sha256
         (base32 "0d6g7qvfv1jlzbzh6asprqdblqd59grvlvr3nwbdqdqrmwlbfm7d"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                ;; Do not test the myproject.toml build as it tries to pull
-                ;; dependencies from the Internet.
-                (invoke "pytest" "-vv" "-k" "not project")))))))
+     (list  ; Do not test the myproject.toml build as it pulls dependencies.
+      #:test-flags '(list "-k" "not project")))
     (native-inputs
      (list python-pytest
            python-pytest-black
-- 
2.41.0

[bug#70855] [PATCH 54/92] gnu: python-jaraco-context: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm:
  (python-jaraco-context)[build-system]: Move to pyproject-build-system.
  (python-jaraco)[arguments]: Convert <#:phases> to <#:test-flags>.

Change-Id: Ifc9b8fc4a9a6c1c2f37fd014eeee1205cd2eb2c4
---
 gnu/packages/python-xyz.scm | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 32991d57a1f..654224ee17e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11818,7 +11818,7 @@ (define-public python-jaraco-context-bootstrap
         (uri (pypi-uri "jaraco.context" version))
         (sha256
          (base32 "0hbjm1rpxf4pzmbdp9rh3ali4zqnlcr8m97bhh1nizxvzcpxim7h"))))
-     (build-system python-build-system)
+     (build-system pyproject-build-system)
      (arguments (list #:tests? #f))
      (native-inputs (list python-setuptools-scm))
      (home-page "https://github.com/jaraco/jaraco.context")
@@ -11835,14 +11835,9 @@ (define-public python-jaraco-context
          (package-arguments python-jaraco-context-bootstrap)
        ((#:tests? _ #f)
         (not (%current-target-system)))
-       ((#:phases phases #~%standard-phases)
-        #~(modify-phases #$phases
-            (replace 'check
-              (lambda* (#:key tests? #:allow-other-keys)
-                (when tests?
-                  ;; Do not test the myproject.toml build as it tries to pull
-                  ;; dependencies from the Internet.
-                  (invoke "pytest" "-vv" "-k" "not project"))))))))
+       ;; Do not test the myproject.toml build as it pulls dependencies.
+       ((#:test-flags test-flags '())
+        '(list "-k" "not project"))))
     (native-inputs
      (modify-inputs
          (package-native-inputs python-jaraco-context-bootstrap)
-- 
2.41.0

[bug#70855] [PATCH 55/92] gnu: python-jaraco-functools: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm:
  (python-jaraco-functools-bootstrap)[build-system]: Move to
  pyproject-build-system.
  (python-jaraco-functools)[arguments]: Convert <#:phases> to
  <#:test-flags>.

Change-Id: Id41967b3cb426045877ceccd9b391d545d759560
---
 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 654224ee17e..93d2a5bb07b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11863,7 +11863,7 @@ (define-public python-jaraco-functools-bootstrap
         (uri (pypi-uri "jaraco.functools" version))
         (sha256
          (base32 "186xqzs3bqhjwajnprxy3sc3h0w5vdld8spc1dxjnn9720yykq1i"))))
-     (build-system python-build-system)
+     (build-system pyproject-build-system)
      (arguments (list #:tests? #f))
      (native-inputs (list python-setuptools-scm))
      (propagated-inputs (list python-more-itertools))
@@ -11881,17 +11881,11 @@ (define-public python-jaraco-functools
          (package-arguments python-jaraco-functools-bootstrap)
        ((#:tests? _ #f)
         (not (%current-target-system)))
-       ((#:phases phases #~%standard-phases)
-        #~(modify-phases #$phases
-            (replace 'check
-              (lambda* (#:key tests? #:allow-other-keys)
-                (when tests?
-                  ;; Do not test the myproject.toml build as it tries to pull
-                  ;; dependencies from the Internet.  Do not run a test that
-                  ;; tries to emulate a broken proprietary CI set-up, fails
-                  ;; to do so correctly, and then throws an error about it.
-                  (invoke "pytest" "-vv" "-k"
-                          "not project and not test_function_throttled"))))))))
+       ;; Do not test the myproject.toml build as it pulls dependencies.
+       ;; Do not run a test that tries to emulate a broken proprietary CI
+       ;; set-up, fails to do so correctly, and then throws an error.
+       ((#:test-flags test-flags '())
+        '(list "-k" "not project and not test_function_throttled"))))
     (native-inputs
      (modify-inputs
          (package-native-inputs python-jaraco-functools-bootstrap)
-- 
2.41.0

[bug#70855] [PATCH 56/92] gnu: python-jaraco-packaging: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-jaraco-packaging):
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:test-flags>: Ignore failing tests.

Change-Id: Ied9d42afe9b8ae30d2a3587e4ead770c8153c3c1
---
 gnu/packages/python-xyz.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 93d2a5bb07b..0301c53a5b8 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11911,7 +11911,10 @@ (define-public python-jaraco-packaging
         (sha256
           (base32
             "0zimrnkh33b9g8ffw11mjh6kvs54cy5gcjw1h5cl1r7dc833dmkm"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
+    (arguments
+     (list #:test-flags
+           '(list "-k" "not project and not test_revived_distribution")))
     (propagated-inputs
      (list python-pytest
            python-pytest-checkdocs
-- 
2.41.0

[bug#70855] [PATCH 57/92] gnu: python-jaraco-test: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-jaraco-test):
  [build-system]: Move to pyproject-build-system.
  [arguments]: Convert <#:phases> to <#:test-flags>.

Change-Id: I926671bc2bb62abae24c26a4bddc304133b2c019
---
 gnu/packages/python-xyz.scm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0301c53a5b8..3302892ee82 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11943,11 +11943,7 @@ (define-public python-jaraco-test
                 "0h0x8qmvfkfqvwdx2m7kwhn53sg26k8gkaas7s1730ak772zqrvz"))))
     (build-system pyproject-build-system)
     (arguments
-     (list
-      #:phases #~(modify-phases %standard-phases
-                   (replace 'check
-                     (lambda _
-                       (invoke "pytest" "-vv" "-k" "http"))))))
+     (list #:test-flags '(list "-k" "http")))
     (propagated-inputs (list python-jaraco-context python-jaraco-functools))
     (native-inputs (list python-flake8
                          python-pytest
-- 
2.41.0

[bug#70855] [PATCH 58/92] gnu: python-nbstripout: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* 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
-- 
2.41.0

[bug#70855] [PATCH 59/92] gnu: Add ghc-xcb-types.

[Nicolas Graves via Guix-patches via]

* gnu/packages/xorg.scm (ghc-xcb-types): New variable.

Change-Id: I42d1d49251e9c3d56aecf012a52fff34e678bd94
---
 gnu/packages/xorg.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 2bc6946599c..6c894fc45bf 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -38,6 +38,7 @@
 ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2023, 2024 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2023, 2024 Kaelyn Takata <kaelyn.alexi@protonmail.com>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -62,6 +63,7 @@ (define-module (gnu packages xorg)
   #:use-module (guix git-download)
   #:use-module (guix build-system copy)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system haskell)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
@@ -88,6 +90,9 @@ (define-module (gnu packages xorg)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages haskell)
+  #:use-module (gnu packages haskell-apps)
+  #:use-module (gnu packages haskell-check)
   #:use-module (gnu packages haskell-xyz)
   #:use-module (gnu packages inkscape)
   #:use-module (gnu packages image)
@@ -963,6 +968,26 @@ (define-public glproto
     (license license:x11)
     (properties `((superseded . ,xorgproto)))))
 
+(define-public ghc-xcb-types
+  (package
+    (name "ghc-xcb-types")
+    (version "0.13.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "xcb-types" version))
+       (sha256
+        (base32 "0qdfj4d83b1fjmlysqncgi65ldf3qnrsj4lync95mgbaq2kzxj2r"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "xcb-types")))
+    (inputs (list ghc-xml))
+    (home-page "http://community.haskell.org/~aslatter/code/xcb-types")
+    (synopsis "Parse XML files used by the XCB project")
+    (description
+     "This package provides types which mirror the structures used in the XCB code
+generation XML files and parses these XML files into Haskell data structures.")
+    (license license:bsd-3)))
+
 (define-public iceauth
   (package
     (name "iceauth")
-- 
2.41.0

[bug#70855] [PATCH 60/92] gnu: python-sparse: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-sparse):
  [build-system]: Move to pyproject-build-system.
  [arguments]: Remove unneeded field.

Change-Id: If3f785ede09ef79384b66166ad2f1c2a5f6e7c84
---
 gnu/packages/python-xyz.scm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3302892ee82..0c88e48870c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8733,14 +8733,7 @@ (define-public python-sparse
        (sha256
         (base32
          "1600xad37mff46xg80cy6bi3l2n6jm69j7sl19rzdmkcgyijfn2z"))))
-    (build-system python-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "python" "-m" "pytest" "-v")))))))
+    (build-system pyproject-build-system)
     (propagated-inputs
      (list python-numba python-numpy python-scipy))
     (native-inputs
-- 
2.41.0

[bug#70855] [PATCH 61/92] gnu: python-pytest-enabler: Break dependency cycle.

[Nicolas Graves via Guix-patches via]

* gnu/packages/check.scm
(python-pytest-enabler-bootstrap): Delete variable.
(python-pytest-enabler): Redefine variable.

* gnu/packages/python-xyz.scm
(python-jaraco-classes)[native-inputs]: Remove
python-pytest-enabler-bootstrap.
(python-jaraco-context-bootstrap): Delete variable.
(python-jaraco-context): Redefine variable.
(python-jaraco-functools-bootstrap): Delete variable.
(python-jaraco-functools): Redefine variable.

Change-Id: I96649093009beb7a3d0e9716eced778d4fc800e2
---
 gnu/packages/check.scm      |  80 +++++++-------------
 gnu/packages/python-xyz.scm | 142 +++++++++++++++---------------------
 2 files changed, 85 insertions(+), 137 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 1d0be03d406..880d3cb46f3 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2474,60 +2474,36 @@ (define-public python-lit
 failures.")
     (license license:ncsa)))
 
-;;; This is marked as a bootstrap package because it propagates bootstrapped
-;;; versions of jaraco-context and jaraco-functools.
-(define-public python-pytest-enabler-bootstrap
-  (hidden-package
-   (package
-     (name "python-pytest-enabler-bootstrap")
-     (version "1.2.1")
-     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "pytest-enabler" version))
-        (sha256
-         (base32 "023ymm0r2gpn5q7aikvx567s507j0zk46w41w6gxb69c688zgs73"))))
-     (build-system python-build-system)
-     (arguments (list #:tests? #f))
-     (propagated-inputs
-      (list python-jaraco-context-bootstrap
-            python-jaraco-functools-bootstrap
-            python-toml))
-     (native-inputs (list python-setuptools-scm))
-     (home-page "https://github.com/jaraco/pytest-enabler")
-     (synopsis "Enable installed pytest plugins")
-     (description "Enable installed pytest plugins")
-     (license license:expat))))
-
 (define-public python-pytest-enabler
-  (package/inherit python-pytest-enabler-bootstrap
-    (arguments
-     (substitute-keyword-arguments
-       (strip-keyword-arguments
-         '(#:tests?)
-         (package-arguments python-pytest-enabler-bootstrap))
-       ((#:phases phases #~%standard-phases)
-        #~(modify-phases #$phases
-            (replace 'check
-              (lambda* (#:key tests? #:allow-other-keys)
-                (when tests?
-                  (invoke "python" "-m" "pytest" "-vv" "tests"))))))))
+  (package
+    (name "python-pytest-enabler")
+    (version "1.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest-enabler" version))
+       (sha256
+        (base32 "023ymm0r2gpn5q7aikvx567s507j0zk46w41w6gxb69c688zgs73"))))
+    (build-system pyproject-build-system)
+    (arguments (list #:tests? #f
+                     #:test-flags '(list "tests")))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs python-pytest-enabler-bootstrap)
-       (replace "python-jaraco-context-bootstrap" python-jaraco-context)
-       (replace "python-jaraco-functools-bootstrap" python-jaraco-functools)))
-    (native-inputs
-     (modify-inputs (package-native-inputs python-pytest-enabler-bootstrap)
-       (append python-pytest
-               python-pytest-black
-               python-pytest-checkdocs
-               python-pytest-cov
-               python-pytest-flake8
-               python-pytest-mypy
-               python-types-toml)))
-    (properties (alist-delete 'hidden?
-                              (package-properties
-                               python-pytest-enabler-bootstrap)))))
+     (list python-jaraco-context
+           python-jaraco-functools
+           python-toml))
+    (native-inputs (list python-pytest
+                         python-pytest-black
+                         python-pytest-checkdocs
+                         python-pytest-cov
+                         python-pytest-flake8
+                         python-pytest-mypy
+                         python-setuptools
+                         python-setuptools-scm
+                         python-types-toml))
+    (home-page "https://github.com/jaraco/pytest-enabler")
+    (synopsis "Enable installed pytest plugins")
+    (description "Enable installed pytest plugins")
+    (license license:expat)))
 
 (define-public python-pytest-freezegun
   (package
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0c88e48870c..42bde34a486 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11724,7 +11724,6 @@ (define-public python-jaraco-classes
            python-pytest-black
            python-pytest-checkdocs
            python-pytest-cov
-           python-pytest-enabler-bootstrap ;OK since not propagated
            python-pytest-flake8
            python-pytest-mypy
            python-setuptools-scm
@@ -11799,99 +11798,72 @@ (define-public python-jaraco-collections
 @end itemize")
     (license license:expat)))
 
-;;; Variant used to break a cycle with python-pytest-enabler.
-(define-public python-jaraco-context-bootstrap
-  (hidden-package
-   (package
-     (name "python-jaraco-context-bootstrap")
-     (version "4.1.1")
-     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "jaraco.context" version))
-        (sha256
-         (base32 "0hbjm1rpxf4pzmbdp9rh3ali4zqnlcr8m97bhh1nizxvzcpxim7h"))))
-     (build-system pyproject-build-system)
-     (arguments (list #:tests? #f))
-     (native-inputs (list python-setuptools-scm))
-     (home-page "https://github.com/jaraco/jaraco.context")
-     (synopsis "Context managers Python library")
-     (description "This Python library provides context managers-related
-procedures.")
-     (license license:expat))))
-
 (define-public python-jaraco-context
-  (package/inherit python-jaraco-context-bootstrap
+  (package
     (name "python-jaraco-context")
+    (version "4.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "jaraco.context" version))
+       (sha256
+        (base32 "0hbjm1rpxf4pzmbdp9rh3ali4zqnlcr8m97bhh1nizxvzcpxim7h"))))
+    (build-system pyproject-build-system)
     (arguments
-     (substitute-keyword-arguments
-         (package-arguments python-jaraco-context-bootstrap)
-       ((#:tests? _ #f)
-        (not (%current-target-system)))
-       ;; Do not test the myproject.toml build as it pulls dependencies.
-       ((#:test-flags test-flags '())
-        '(list "-k" "not project"))))
+     (list #:tests? (not (%current-target-system))
+           ;; Do not test the myproject.toml build as it pulls dependencies.
+           #:test-flags '(list "-k" "not project")))
     (native-inputs
-     (modify-inputs
-         (package-native-inputs python-jaraco-context-bootstrap)
-       (append python-pytest
-               python-pytest-black
-               python-pytest-checkdocs
-               python-pytest-cov
-               python-pytest-enabler-bootstrap ;OK since not propagated
-               python-pytest-flake8
-               python-pytest-mypy)))
-    (properties (alist-delete 'hidden? (package-properties
-                                        python-jaraco-context-bootstrap)))))
-
-;;; Variant used to break a cycle with python-pytest-enabler.
-(define-public python-jaraco-functools-bootstrap
-  (hidden-package
-   (package
-     (name "python-jaraco-functools-bootstrap")
-     (version "3.5.0")
-     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "jaraco.functools" version))
-        (sha256
-         (base32 "186xqzs3bqhjwajnprxy3sc3h0w5vdld8spc1dxjnn9720yykq1i"))))
-     (build-system pyproject-build-system)
-     (arguments (list #:tests? #f))
-     (native-inputs (list python-setuptools-scm))
-     (propagated-inputs (list python-more-itertools))
-     (home-page "https://github.com/jaraco/jaraco.functools")
-     (synopsis "Python library extending Python's @code{functools}")
-     (description "This library extends the standard @code{functools} Python
-module with a few extra procedures.")
-     (license license:expat))))
+     (list python-pytest
+           python-pytest-black
+           python-pytest-checkdocs
+           python-pytest-cov
+           python-pytest-flake8
+           python-pytest-mypy
+           python-setuptools
+           python-setuptools-scm
+           python-wheel))
+    (home-page "https://github.com/jaraco/jaraco.context")
+    (synopsis "Context managers Python library")
+    (description "This Python library provides context managers-related
+procedures.")
+    (license license:expat)))
 
 (define-public python-jaraco-functools
-  (package/inherit python-jaraco-functools-bootstrap
+  (package
     (name "python-jaraco-functools")
+    (version "3.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "jaraco.functools" version))
+       (sha256
+        (base32 "186xqzs3bqhjwajnprxy3sc3h0w5vdld8spc1dxjnn9720yykq1i"))))
+    (build-system pyproject-build-system)
     (arguments
-     (substitute-keyword-arguments
-         (package-arguments python-jaraco-functools-bootstrap)
-       ((#:tests? _ #f)
-        (not (%current-target-system)))
-       ;; Do not test the myproject.toml build as it pulls dependencies.
-       ;; Do not run a test that tries to emulate a broken proprietary CI
-       ;; set-up, fails to do so correctly, and then throws an error.
-       ((#:test-flags test-flags '())
-        '(list "-k" "not project and not test_function_throttled"))))
+     (list #:tests? (not (%current-target-system))
+           ;; Do not test the myproject.toml build as it pulls dependencies.
+           ;; Do not run a test that tries to emulate a broken proprietary
+           ;; CI set-up, fails to do so correctly, and then throws an error.
+           #:test-flags
+           '(list "-k" "not project and not test_function_throttled")))
     (native-inputs
-     (modify-inputs
-         (package-native-inputs python-jaraco-functools-bootstrap)
-       (append python-jaraco-classes
-               python-pytest
-               python-pytest-black
-               python-pytest-checkdocs
-               python-pytest-cov
-               python-pytest-enabler-bootstrap ;OK since not propagated
-               python-pytest-flake8
-               python-pytest-mypy)))
-    (properties (alist-delete 'hidden? (package-properties
-                                        python-jaraco-functools-bootstrap)))))
+     (list python-jaraco-classes
+           python-pytest
+           python-pytest-black
+           python-pytest-checkdocs
+           python-pytest-cov
+           python-pytest-flake8
+           python-pytest-mypy
+           python-setuptools
+           python-setuptools-scm
+           python-wheel))
+    (propagated-inputs (list python-more-itertools))
+    (home-page "https://github.com/jaraco/jaraco.functools")
+    (synopsis "Python library extending Python's @code{functools}")
+    (description "This library extends the standard @code{functools} Python
+module with a few extra procedures.")
+    (license license:expat)))
 
 (define-public python-jaraco-packaging
   (package
-- 
2.41.0

[bug#70855] [PATCH 62/92] gnu: python-pint: Disable benchmark tests.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-pint):
  [arguments]<#:test-flags>: Disable benchmark tests.

Change-Id: I0c6f0512f10f3e96da8b2fd4567df7d43703be10
---
 gnu/packages/python-xyz.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 42bde34a486..2eeecfa644b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1671,7 +1671,8 @@ (define-public python-pint
     (arguments
      (list
       #:test-flags
-      '(list "-k" (string-append
+      '(list "--ignore=pint/testsuite/benchmarks"
+             "-k" (string-append
                    ;; This test tries to write to $HOME/.cache/pint.
                    "not test_auto"
                    ;; Fails with "Group USCSLengthInternational already
-- 
2.41.0

[bug#70855] [PATCH 63/92] gnu: python-apprise: Improve package style.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-apprise):
  [arguments]: Convert <#:phases>  check replacement into
  <#:test-flags>.

Change-Id: I85c2ebadf65a4f1a7735042e784e56313c3de539
---
 gnu/packages/python-xyz.scm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 2eeecfa644b..0d993fbb208 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -329,12 +329,7 @@ (define-public python-apprise
                          python-wheel))
     (arguments
      (list
-      #:phases #~(modify-phases %standard-phases
-                   (replace 'check
-                     (lambda* (#:key tests? inputs outputs #:allow-other-keys)
-                       (when tests?
-                         (delete-file "test/test_plugin_macosx.py")
-                         (invoke "pytest")))))))
+      #:test-flags '(list "--ignore=test/test_plugin_macosx.py")))
     (home-page "https://github.com/caronc/apprise")
     (synopsis
      "Push notification Python library that works with many platforms")
-- 
2.41.0

[bug#70855] [PATCH 64/92] gnu: python-autoflake: Update to 2.3.1.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-autoflake): Update to 2.3.1.
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:phases>: Add check phase replacement.
  [native-inputs]: Add python-hatchling.

Change-Id: I0421107a98b1181a76e1874f23e6aa6e7709e434
---
 gnu/packages/python-xyz.scm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0d993fbb208..1f9ebc15e02 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14890,14 +14890,23 @@ (define-public python-flake8-isort
 (define-public python-autoflake
   (package
     (name "python-autoflake")
-    (version "1.3.1")
+    (version "2.3.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "autoflake" version))
        (sha256
-        (base32 "0nzr057dbmgprp4a52ymafdkdd5zp2wcqf42913xc7hhvvdbj338"))))
-    (build-system python-build-system)
+        (base32 "17lhrmz6h7pz2nald90p8gn3hhzbqwmd78819yf4b1habgf7b2y9"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda _
+              (invoke "python" "test_autoflake.py"))))))
+    (native-inputs
+     (list python-hatchling))
     (propagated-inputs
      (list python-pyflakes))
     (home-page "https://github.com/myint/autoflake")
-- 
2.41.0

[bug#70855] [PATCH 65/92] gnu: python-orderedmultidict: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-orderedmultidict):
  [build-system]: Move to pyproject-build-system.

Change-Id: I092a1af47c3a8a0fd510c48df679e1045715c1e8
---
 gnu/packages/python-xyz.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1f9ebc15e02..b21bb7e862d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9934,9 +9934,8 @@ (define-public python-orderedmultidict
         (method url-fetch)
         (uri (pypi-uri "orderedmultidict" version))
         (sha256
-          (base32
-            "1bc2v0yflsxjyyjx4q9wqx0j3bvzcw9z87d5pz4iqac7bsxhn1q4"))))
-    (build-system python-build-system)
+          (base32 "1bc2v0yflsxjyyjx4q9wqx0j3bvzcw9z87d5pz4iqac7bsxhn1q4"))))
+    (build-system pyproject-build-system)
     (propagated-inputs
      (list python-six))
     (native-inputs
-- 
2.41.0

[bug#70855] [PATCH 66/92] gnu: python-shtab: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-shtab):
  [build-system]: Move to pyproject-build-system.
  [arguments]: Remove uneeded field.

Change-Id: Ie27661677e88c5743423946d13bbe07a2c51bf36
---
 gnu/packages/python-xyz.scm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b21bb7e862d..5a12dacbc8c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -35612,7 +35612,7 @@ (define-public python-shtab
         (uri (pypi-uri "shtab" version))
         (sha256
           (base32 "127mymfm7r0hddk2vknqq34fj6dirj6ip990i3g4isx0lsd7pnsc"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (native-inputs
       (list bash
             python-pytest
@@ -35620,15 +35620,6 @@ (define-public python-shtab
             python-pytest-timeout
             python-setuptools-scm
             python-wheel))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace
-             'check
-           (lambda* (#:key tests? inputs outputs #:allow-other-keys)
-             (when tests?
-               (add-installed-pythonpath inputs outputs)
-               (invoke "pytest")))))))
     (home-page "https://github.com/iterative/shtab")
     (synopsis "Automagic shell tab completion for Python CLI applications")
     (description
-- 
2.41.0

[bug#70855] [PATCH 67/92] gnu: python-flake8-isort: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-flake8-isort):
  [build-system]: Move to pyproject-build-system.
  [arguments]: Remove uneeded field.

Change-Id: Ie8c32f6164030daf28760a58f33aff1d540fc6a5
---
 gnu/packages/python-xyz.scm | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5a12dacbc8c..191e53a494e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14868,15 +14868,7 @@ (define-public python-flake8-isort
         (uri (pypi-uri "flake8-isort" version))
         (sha256
           (base32 "0gk4q504v42hdzpkndczc0kkwnr85jn1h5pvb561jh65p91r6qyl"))))
-    (build-system python-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "pytest" "-vv" "run_tests.py")))))))
+    (build-system pyproject-build-system)
     (propagated-inputs (list python-flake8 python-isort))
     (native-inputs (list python-pytest))
     (home-page "https://github.com/gforcada/flake8-isort")
-- 
2.41.0

[bug#70855] [PATCH 68/92] gnu: python-xmltodict: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/xml.scm (python-xmltodict):
  [build-system]: Move to pyproject-build-system.
  [native-inputs]: Add python-setuptools and python-wheel.

Change-Id: Ifb8f3f4aa56255ca596d9c8ae5ae41be479daf90
---
 gnu/packages/xml.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index c6ddae50ae6..2654f688d4b 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -33,6 +33,7 @@
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz>
 ;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -67,6 +68,7 @@ (define-module (gnu packages xml)
   #:use-module (gnu packages nss)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-check)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages python)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages web)
@@ -80,6 +82,7 @@ (define-module (gnu packages xml)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix deprecation)
   #:use-module (guix utils)
   #:use-module (gnu packages linux)
@@ -1945,9 +1948,9 @@ (define-public python-xmltodict
        (sha256
         (base32
          "08cadlb9vsb4pmzc99lz3a2lx6qcfazyvgk10pcqijvyxlwcdn2h"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (native-inputs
-     (list python-coverage python-nose))
+     (list python-coverage python-nose python-setuptools python-wheel))
     (home-page "https://github.com/martinblech/xmltodict")
     (synopsis "Work with XML like you are working with JSON")
     (description "This package provides a Python library to convert XML to
-- 
2.41.0

[bug#70855] [PATCH 69/92] gnu: python-rich: Update to 13.7.1.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-rich): Update to 13.7.1.

Change-Id: I7fff0b124e989a0a5ace2c73c92d4b32497cf3e9
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 191e53a494e..0cfb1dfd45d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -20247,7 +20247,7 @@ (define-public python-slugid
 (define-public python-rich
   (package
     (name "python-rich")
-    (version "13.7.0")
+    (version "13.7.1")
     (source
       (origin
         ;; There are no tests in the PyPI tarball.
@@ -20258,7 +20258,7 @@ (define-public python-rich
         (file-name (git-file-name name version))
         (sha256
          (base32
-          "0qyhw2vvk17qdmfrmi45z4dd0fkwx3l2qrf3iy0yc2y7pfgrmg9g"))))
+          "0jvkcp473c0icbb8md3grc3285j2cy0z0swxgk2g67d9n0zfdfzc"))))
     (build-system pyproject-build-system)
     (arguments
      (list
-- 
2.41.0

[bug#70855] [PATCH 70/92] gnu: python-cmd2: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-cmd2):
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:phases>: Remove check phase replacement.
  <#:test-flags>: Add field.

Change-Id: I55b4134fb6caa4af1a4988934043487fa85f9b9b
---
 gnu/packages/python-xyz.scm | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0cfb1dfd45d..9639b1027b5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -31721,18 +31721,10 @@ (define-public python-cmd2
        (sha256
         (base32
          "0h1naik558qh48gx2iyy0a0khvw5fz0in69y84mbrhsm9nq7w3bm"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (if tests?
-                 (invoke "pytest" "-vv" "-k"
-                         ;; These tests fail because no EDITOR is in PATH.
-                         "not test_find_editor_not_specified \
-and not test_transcript")
-                 (format #t "test suite not run~%")))))))
+     (list #:test-flags '(list "-k" "not test_find_editor_not_specified \
+and not test_transcript")))
     (propagated-inputs
      (list python-attrs python-colorama python-pyperclip python-wcwidth))
     (native-inputs
-- 
2.41.0

[bug#70855] [PATCH 71/92] gnu: Add python-sphinx-autodoc-typehints-5.

[Nicolas Graves via Guix-patches via]

* gnu/packages/sphinx.scm (python-sphinx-autodoc-typehints-5): New variable.

Change-Id: I465979829851681635d1073658f262a96758cfb5
---
 gnu/packages/sphinx.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 195cd63ae61..e6668146849 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -1162,6 +1162,13 @@ (define-public python-sphinx-autodoc-typehints
 documenting acceptable argument types and return value types of functions.")
     (license license:expat)))
 
+(define-public python-sphinx-autodoc-typehints-5
+  (package/inherit python-sphinx-autodoc-typehints
+    (propagated-inputs
+     (modify-inputs
+         (package-propagated-inputs python-sphinx-autodoc-typehints)
+       (replace "python-sphinx" python-sphinx-5)))))
+
 (define-public python-sphinx-pytest
   (package
     (name "python-sphinx-pytest")
-- 
2.41.0

[bug#70855] [PATCH 72/92] gnu: python-uqbar: Improve package style.

[Nicolas Graves via Guix-patches via]

* gnu/packages/graphviz.scm (python-uqbar): Improve package style.
  [build-system]: Move to pyproject-build-system.
  [arguments]: Convert 'check phase replacement to <#:test-flags>.

Change-Id: I536e60438e3f2d5592ab9cd34fe66104cfd117e2
---
 gnu/packages/graphviz.scm | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index fe67d103865..8ef3642e7e7 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -213,15 +213,9 @@ (define-public python-uqbar
         (base32
          "0c573nzpm51qgz2g296f8pw8ys0i3r6daynxk06zagk5l5fgw9ar"))
        (patches (search-patches "python-uqbar-python3.10.patch"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "python" "-m" "pytest" "tests"))
-             #t)))))
+     (list #:test-flags '(list "tests")))
     (native-inputs
      (list graphviz
            python-flake8
-- 
2.41.0

[bug#70855] [PATCH 73/92] gnu: python-uqbar: Upgrade to python-team branch.

[Nicolas Graves via Guix-patches via]

* gnu/packages/graphviz.scm (python-uqbar): Upgrade to python-team
branch's changes.
  [arguments]<#:test-flags>: Ignore failing tests.
  [propagated-inputs]: Replace python-sphinx by python-sphinx-5.

Change-Id: I07122f953e806081d9134d39e16675eb0f839bbc
---
 gnu/packages/graphviz.scm | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index 8ef3642e7e7..b6c46a9d9ec 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -215,7 +215,15 @@ (define-public python-uqbar
        (patches (search-patches "python-uqbar-python3.10.patch"))))
     (build-system pyproject-build-system)
     (arguments
-     (list #:test-flags '(list "tests")))
+     (list #:test-flags
+           '(list "tests"
+                  "-k" (string-append
+                        "not test_interpret_code_blocks_02 "
+                        "and not test_find_executable "
+                        "and not test_sphinx_api_1 "
+                        "and not test_sphinx_book_text_cached "
+                        "and not test_sphinx_book_text_uncached "
+                        "and not test_sphinx_book_text_broken_strict"))))
     (native-inputs
      (list graphviz
            python-flake8
@@ -224,8 +232,12 @@ (define-public python-uqbar
            python-pytest
            python-pytest-cov))
     (propagated-inputs
-     (list python-black python-sphinx python-sphinx-rtd-theme
-           python-unidecode))
+     (list python-black python-sphinx-5 python-unidecode
+           (package/inherit python-sphinx-rtd-theme
+             (propagated-inputs
+              (modify-inputs
+                  (package-propagated-inputs python-sphinx-rtd-theme)
+                (replace "python-sphinx" python-sphinx-5))))))
     (home-page "https://github.com/josiah-wolf-oberholtzer/uqbar")
     (synopsis "Tools for building documentation with Sphinx, Graphviz and LaTeX")
     (description
-- 
2.41.0

[bug#70855] [PATCH 74/92] gnu: python-uqbar: Update to 0.6.9.

[Nicolas Graves via Guix-patches via]

* gnu/packages/graphviz.scm (python-uqbar): Update to 0.6.9.

Change-Id: Iee24cb1c66db162001c618d1f64a9e2406c1dacd
---
 gnu/local.mk                                  |  1 -
 gnu/packages/graphviz.scm                     | 19 ++++-----------
 .../patches/python-uqbar-python3.10.patch     | 23 -------------------
 3 files changed, 5 insertions(+), 38 deletions(-)
 delete mode 100644 gnu/packages/patches/python-uqbar-python3.10.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 9c61039239b..8d0bfd781f8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1835,7 +1835,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-sgmllib3k-assertions.patch	\
   %D%/packages/patches/python-sphinx-prompt-docutils-0.19.patch	\
   %D%/packages/patches/python-typeguard-python3.10.patch	\
-  %D%/packages/patches/python-uqbar-python3.10.patch	        \
   %D%/packages/patches/python-wxwidgets-type-errors.patch	\
   %D%/packages/patches/qtdeclarative-5-disable-qmlcache.patch	\
   %D%/packages/patches/qtdeclarative-disable-qmlcache.patch	\
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index b6c46a9d9ec..2c23b6abd5c 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -201,7 +201,7 @@ (define-public python-pygraphviz
 (define-public python-uqbar
   (package
     (name "python-uqbar")
-    (version "0.5.9")
+    (version "0.6.9")
     (source
      (origin
        (method git-fetch)
@@ -210,20 +210,11 @@ (define-public python-uqbar
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0c573nzpm51qgz2g296f8pw8ys0i3r6daynxk06zagk5l5fgw9ar"))
-       (patches (search-patches "python-uqbar-python3.10.patch"))))
+        (base32 "037qj3rymm6xzdpklddfhmfp2p1bq9fi3jrvxj6gmharphd5z869"))))
     (build-system pyproject-build-system)
-    (arguments
-     (list #:test-flags
-           '(list "tests"
-                  "-k" (string-append
-                        "not test_interpret_code_blocks_02 "
-                        "and not test_find_executable "
-                        "and not test_sphinx_api_1 "
-                        "and not test_sphinx_book_text_cached "
-                        "and not test_sphinx_book_text_uncached "
-                        "and not test_sphinx_book_text_broken_strict"))))
+    (arguments  ; XXX: Disable failing tests.
+     (list #:test-flags '(list "tests" "-k" "not test_find_executable \
+and not test_sphinx_book_text_broken_strict")))
     (native-inputs
      (list graphviz
            python-flake8
diff --git a/gnu/packages/patches/python-uqbar-python3.10.patch b/gnu/packages/patches/python-uqbar-python3.10.patch
deleted file mode 100644
index 164f0c0c64d..00000000000
--- a/gnu/packages/patches/python-uqbar-python3.10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Since Python 3.10 the output of a CLI program created with argparse
-uses "options" instead of "optional arguments". This behaviour breaks
-the tests in python-uqbar.
-
---- a/tests/test_cli.py
-+++ b/tests/test_cli.py
-@@ -84,7 +84,7 @@ def test_call_help():
- 
-         speak like a cat
- 
--        optional arguments:
-+        options:
-           -h, --help  show this help message and exit
-           --version   show program's version number and exit
-           --loud      be adamant
-@@ -101,6 +101,6 @@ def test_help():
-         """
-         usage: vox-aggregator [-h] [--version] {help,list,birds,mammals} ...
- 
--        optional arguments:
-+        options:
-           -h, --help            show this help message and exit
-           --version             show program's version number and exit
-- 
2.41.0

[bug#70855] [PATCH 75/92] gnu: python-typeguard-4: Ignore failing tests.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-typeguard-4)
  [arguments]<#:test-flags>: Ignore failing tests.

Change-Id: I0e23eb81cab942c9838d9561268f51b57a461d89
---
 gnu/packages/python-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9639b1027b5..f145f19964c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -26669,7 +26669,7 @@ (define-public python-typeguard-4
         (base32 "11yrc7pv2fajmicwiyc92sb5gphlw3zbxww8f2prrsh6rgdv6kqr"))))
     (build-system pyproject-build-system)
     (arguments
-     '())
+     (list #:test-flags '(list "--ignore=tests/mypy")))
     (propagated-inputs (list python-typing-extensions))
     (native-inputs (modify-inputs (package-native-inputs python-typeguard)
                                   (append python-setuptools python-wheel)))))
-- 
2.41.0

[bug#70855] [PATCH 76/92] gnu: python-zope-i18nmessageid: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (python-zope-i18nmessageid):
  [build-system]: Move to pyproject-build-system.
  [native-inputs]: Add python-setuptools and python-wheel.

Change-Id: Ia9e142a53721bb6d7495d87b59d5f4f3b3f77bf2
---
 gnu/packages/python-web.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 4d3fc75bb3c..c24a3daa2e1 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3123,9 +3123,10 @@ (define-public python-zope-i18nmessageid
        (uri (pypi-uri "zope.i18nmessageid" version))
        (sha256
         (base32 "14mx62khys82p2gmmf3m40x4jmvcz3rndvl6qik2n2qfp13n7ds7"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (native-inputs
-     (list python-coverage python-zope-testrunner))
+     (list python-coverage python-setuptools
+           python-wheel python-zope-testrunner))
     (propagated-inputs
      (list python-six))
     (home-page "https://pypi.org/project/zope.i18nmessageid/")
-- 
2.41.0

[bug#70855] [PATCH 77/92] gnu: python-funsor: Ignore flaky test.

[Nicolas Graves via Guix-patches via]

* gnu/packages/machine-learning.scm (python-funsor)
  [arguments]<#:test-flags>: Ignore flaky test.

Change-Id: I6b86c6478c89833609b2ac5821b5509acf589fa6
---
 gnu/packages/machine-learning.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index ddf8bedf047..21d58d9aae9 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -170,6 +170,8 @@ (define-public python-funsor
        (sha256
         (base32 "0cgysij0dix0fikyz2x4f8jvaskm5s5a04s07chzaz2dw1fpxdq8"))))
     (build-system pyproject-build-system)
+    (arguments  ; disable flaky test
+     (list #:test-flags '(list "-k" "not test_integrate_variable[x23-i]")))
     (propagated-inputs (list python-makefun python-multipledispatch
                              python-numpy python-opt-einsum
                              python-typing-extensions))
-- 
2.41.0

[bug#70855] [PATCH 78/92] gnu: borgmatic: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/backup.scm (borgmatic):
  [build-system]: Move to pyproject-build-system.
  [arguments]: Migrate 'check phase replacement to <#:test-flags>.

Change-Id: I916e87f10c75718c4e840d97eaa78623ed2a4fd3
---
 gnu/packages/backup.scm | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 5e74439bffc..663eb2568fe 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -24,6 +24,7 @@
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2022 Feng Shu <tumashu@163.com>
 ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -46,6 +47,7 @@ (define-module (gnu packages backup)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system qt)
   #:use-module (guix download)
   #:use-module (guix gexp)
@@ -1332,7 +1334,7 @@ (define-public borgmatic
        (uri (pypi-uri "borgmatic" version))
        (sha256
         (base32 "1xmqv0gg2ic7lp5kmygr9f6qkabsr86mma7pigan12vk2bcdbw31"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      (list
       #:phases #~(modify-phases %standard-phases
@@ -1348,15 +1350,7 @@ (define-public borgmatic
                          (("(module.get_local_path.+ == )'borg'" all start)
                           (string-append start "'"
                                          (search-input-file inputs "bin/borg")
-                                         "'")))))
-                   (replace 'check
-                     (lambda* (#:key tests? #:allow-other-keys)
-                       (when tests?
-                         ;; Tests require the installed executable.
-                         (setenv "PATH"
-                                 (string-append #$output "/bin" ":"
-                                                (getenv "PATH")))
-                         (invoke "pytest")))))))
+                                         "'"))))))))
     (inputs (list borg
                   python-apprise
                   python-colorama
-- 
2.41.0

[bug#70855] [PATCH 79/92] gnu: tuir: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/syndication.scm (tuir):
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:phases>: Replace 'check phase replacement.
  <#:test-flags>: Ignore failing test.

Change-Id: If88f6c42769b096871bdd73af67d71930e39e399
---
 gnu/packages/syndication.scm | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 18d3df5b6ee..d986e049ccf 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -33,6 +33,7 @@ (define-module (gnu packages syndication)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system meson)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
@@ -55,6 +56,7 @@ (define-module (gnu packages syndication)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pretty-print)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-check)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages python-web)
@@ -456,16 +458,13 @@ (define-public tuir
         (sha256
          (base32
           "06xb030ibphbrz4nsxm8mh3g60ld8xfp6kc3j6vi1k4ls5s4h79i"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (delete 'sanity-check)         ; Tries to read environment variables.
-         (replace 'check
-           (lambda* (#:key tests? inputs outputs #:allow-other-keys)
-             (add-installed-pythonpath inputs outputs)
-             (when tests?
-               (invoke "pytest")))))))
+     (list #:test-flags
+           '(list "-k" "not test_content_humanize_timestamp")
+           #:phases
+           #~(modify-phases %standard-phases
+               (delete 'sanity-check))))  ; Reads environment variables.
     (inputs
      (list python-beautifulsoup4 python-decorator python-kitchen
            python-requests python-six))
-- 
2.41.0

[bug#70855] [PATCH 80/92] gnu: python-pytest-trio: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-check.scm (python-pytest-trio):
  [build-system]: Move to pyproject-build-system.
  [arguments]: Move from <#:phases> to <#test-flags>.

Change-Id: I7653110fc299d0757f7e01c2c1c29d599cb206bf
---
 gnu/packages/python-check.scm | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index ccda2042fb6..46c8b3414e4 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1186,22 +1186,17 @@ (define-public python-pytest-trio
        (uri (pypi-uri "pytest-trio" version))
        (sha256
         (base32 "0c8cqf9by2884riksrqymqfp2g1d2d798a2zalcw9hmf34c786y0"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? inputs outputs #:allow-other-keys)
-             (when tests?
-               (add-installed-pythonpath inputs outputs)
-               (invoke "pytest" "-W" "error" "-ra" "-v" "--pyargs"
-                       "pytest_trio" "--verbose" "--cov" "-k"
-                       (string-append
-                         ;; Needs network
-                         "not test_async_yield_fixture_with_nursery"
-                         " and not test_try"
-                         ;; No keyboard interrupt in our build environment.
-                         " and not test_actual_test"))))))))
+     (list
+      #:test-flags '(list "-W" "error" "-ra" "-v" "--pyargs"
+                          "pytest_trio" "--verbose" "--cov" "-k"
+                          (string-append
+                           ;; Needs network
+                           "not test_async_yield_fixture_with_nursery"
+                           " and not test_try"
+                           ;; No keyboard interrupt in our build environment.
+                           " and not test_actual_test"))))
     (native-inputs
      (list python-hypothesis python-pytest python-pytest-cov))
     (propagated-inputs
-- 
2.41.0

[bug#70855] [PATCH 81/92] gnu: python-fenics-dijitso: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/simulation.scm (python-fenics-dijitso):
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:phases>: Rewrite check phase replacement to care about
  .guix-pytest.

Change-Id: I3383f4078fbb0100e6d8257d7d84785b953ab0cf
---
 gnu/packages/simulation.scm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm
index d5fc1e3d176..ed029efeac1 100644
--- a/gnu/packages/simulation.scm
+++ b/gnu/packages/simulation.scm
@@ -573,7 +573,7 @@ (define-public python-fenics-dijitso
         (sha256
           (base32
             "0lhqsq8ypdak0ahr2jnyvg07yrqp6wicjxi6k56zx24wp3qg60sc"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (inputs
      (list openmpi python-numpy))
     (native-inputs
@@ -586,15 +586,16 @@ (define-public python-fenics-dijitso
          (add-after 'build 'mpi-setup
            ,%openmpi-setup)
          (replace 'check
-           (lambda _
+           (lambda* (#:key inputs #:allow-other-keys)
              (setenv "HOME" "/tmp")
-             (with-directory-excursion "test"
-               ;; Disable parallel tests to avoid race condition.  See
-               ;; https://github.com/pytest-dev/pytest-cov/issues/237.
-               (substitute* "runtests.sh"
-                 (("for p in 1 4 8 16; do")
-                  "for p in 1; do"))
-               (invoke "./runtests.sh")))))))
+             (with-guix-pytest-plugin inputs
+               (with-directory-excursion "test"
+                 ;; Disable parallel tests to avoid race condition.  See
+                 ;; https://github.com/pytest-dev/pytest-cov/issues/237.
+                 (substitute* "runtests.sh"
+                   (("for p in 1 4 8 16; do")
+                    "for p in 1; do"))
+                 (invoke "./runtests.sh"))))))))
     (home-page "https://bitbucket.org/fenics-project/dijitso/")
     (synopsis "Distributed just-in-time building of shared libraries")
     (description
-- 
2.41.0

[bug#70855] [PATCH 82/92] gnu: python-pyan3: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-pyan3):
  [build-system]: Move to pyproject-build-system.
  [arguments]: Remove uneeded field.

Change-Id: I9f9f15ffd5a97666a410af56f02b573b55e45351
---
 gnu/packages/python-xyz.scm | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f145f19964c..61a517f72a6 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -34000,17 +34000,7 @@ (define-public python-pyan3
          "1367x25rcy2y8f0x9c2dbxl2qgdln3arr7ddyzybz2c28g6jrv5z"))
        (patches (search-patches "python-pyan3-fix-positional-arguments.patch"
                                 "python-pyan3-fix-absolute-path-bug.patch"))))
-    (build-system python-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               ;; Extend PYTHONPATH so the built package will be found.
-               (setenv "GUIX_PYTHONPATH"
-                       (string-append (getcwd) ":" (getenv "GUIX_PYTHONPATH")))
-               (invoke "pytest")))))))
+    (build-system pyproject-build-system)
     (native-inputs
      (list python-pytest python-pytest-cov python-wheel))
     (propagated-inputs
-- 
2.41.0

[bug#70855] [PATCH 83/92] gnu: python-numpydoc: Move to pyproject-build-sytem.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-numpydoc):
  [build-system]: Move to pyproject-build-sytem.
  [arguments]: Move <#:phases> check replacement to
  <#:test-flags>.

Change-Id: Ia7a812c4ee2adcd31fc32db1caa7c163cadf46bf
---
 gnu/packages/python-xyz.scm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 61a517f72a6..5ec54c839b1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9182,16 +9182,12 @@ (define-public python-numpydoc
        (sha256
         (base32
          "0k2z3g4s3w39h1nd293542hl9qv55j29gcr3bkia0rr3ldsppnxh"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "pytest" "-v" "numpydoc/tests"
-                       ;; TODO: unclear why these fail.
-                       "-k" "not test_MyClass and not test_my_function")))))))
+     (list #:test-flags
+           '(list "numpydoc/tests"
+                  ;; TODO: unclear why these fail.
+                  "-k" "not test_MyClass and not test_my_function")))
     (propagated-inputs (list python-jinja2 python-sphinx))
     (native-inputs (list python-matplotlib python-pytest python-pytest-cov))
     (home-page "https://pypi.org/project/numpydoc/")
-- 
2.41.0

[bug#70855] [PATCH 84/92] gnu: python-multidict: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-multidict):
  [build-system]: Move to pyproject-build-system.
  [arguments] Remove undeed field.

Change-Id: I916b36e6c4ac25dfc32b5813ad67cf4e6c134d36
---
 gnu/packages/python-xyz.scm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5ec54c839b1..7b99a84b48e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9905,14 +9905,7 @@ (define-public python-multidict
        (sha256
         (base32
          "1kjrxav572j45xvr1iy60zb2g8zqvrinzdkl4ax36js4vczckl8d"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (replace 'check
-                    (lambda* (#:key tests? #:allow-other-keys)
-                      (if tests?
-                          (invoke "pytest" "-vv")
-                          (format #t "test suite not run~%")))))))
+    (build-system pyproject-build-system)
     (native-inputs
      (list python-pytest python-pytest-cov))
     (home-page "https://github.com/aio-libs/multidict/")
-- 
2.41.0

[bug#70855] [PATCH 85/92] gnu: python-warcio: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (python-warcio):
  [build-system]: Move to pyproject-build-system.
  [arguments]: Use <#:test-flags> instead of check phase replacement.

Change-Id: I7fd1ad51cddcbeb42c6aeeda552eb1a7bcd6e712
---
 gnu/packages/python-web.scm | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index c24a3daa2e1..5f07b3cfc50 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6631,24 +6631,18 @@ (define-public python-warcio
          (sha256
           (base32
            "11afr6zy3r6rda81010iq496dazg4xid0izg3smg6ighpmvsnzf2"))))
-      (build-system python-build-system)
+      (build-system pyproject-build-system)
       (arguments
        (list
-        #:phases
-        #~(modify-phases %standard-phases
-            (replace 'check
-              (lambda* (#:key tests? #:allow-other-keys)
-                (when tests?
-                  (invoke "pytest" "-vv"
-                          ;; These tests fail due to networking requirements.
-                          "-k" (format #f "not ~a"
-                                       (string-join
-                                        '("test_post_chunked"
-                                          "test_remote"
-                                          "test_capture_http_proxy"
-                                          "test_capture_https_proxy"
-                                          "test_capture_https_proxy_same_session")
-                                        " and not ")))))))))
+        #:test-flags  ; These tests fail due to networking requirements.
+        '(list "-k" (format #f "not ~a"
+                            (string-join
+                             '("test_post_chunked"
+                               "test_remote"
+                               "test_capture_http_proxy"
+                               "test_capture_https_proxy"
+                               "test_capture_https_proxy_same_session")
+                             " and not ")))))
       (native-inputs
        ;; These inputs are required for the test suite.
        (list python-httpbin python-pytest-cov python-requests
-- 
2.41.0

[bug#70855] [PATCH 86/92] gnu: python-certauth: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-crypto.scm (python-certauth):
  [build-system]: Move to pyproject-build-system.

Change-Id: If455ef00ff35164c2db401267162025b2ff9c6c2
---
 gnu/packages/python-crypto.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 4a9883a8e3d..7aaa37d7965 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -443,7 +443,7 @@ (define-public python-certauth
        (sha256
         (base32
          "1yxqfb5131wahjyw9pxz03bq476rcfx62s6k53xx4cqbzzgdaqkq"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      (list #:phases
            #~(modify-phases %standard-phases
-- 
2.41.0

[bug#70855] [PATCH 87/92] gnu: python-matplotlib: Ignore failing tests.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-matplotlib)
  [arguments]<#:test-flags>: Ignore failing tests.

Change-Id: I3ecb9e6331f17a9333e27daab8fa9d6c3c408aea
---
 gnu/packages/python-xyz.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7b99a84b48e..90d43de60c1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9335,6 +9335,7 @@ (define-public python-matplotlib
              (string-append
               ;; This one fails with a small difference in the upper left.
               "not test_figure_legend_outside"
+              " and not test_warn_big_data_best_loc"
               ;; The 'test_lazy_auto_backend_selection' fails
               ;; because it would require an X server; skip it.
               " and not test_lazy_auto_backend_selection"))
-- 
2.41.0

[bug#70855] [PATCH 88/92] gnu: python-qemu-qmp: Improve package style.

[Nicolas Graves via Guix-patches via]

* gnu/packages/virtualization.scm (python-qemu-qmp):
  [arguments]<#:phases>: Rewrite check phase replacement to only run
  tests/protocol.py and not quality-checks.

Change-Id: I3485e2ee10d46b1699674f506876e7c185674653
---
 gnu/packages/virtualization.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index c886c7489a7..0b46281050d 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2023,13 +2023,11 @@ (define-public python-qemu-qmp
       #~(modify-phases %standard-phases
           (replace 'check
             (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                ;; The Avocado test runner insists on writing stuff to HOME.
-                (setenv "HOME" "/tmp")
-                ;; The mypy tests fail (see:
-                ;; https://gitlab.com/jsnow/qemu.qmp/-/issues/1).
-                (delete-file "tests/mypy.sh")
-                (invoke "avocado" "--show=all" "run" "tests")))))))
+              (if tests?
+                  (begin  ; avocado insists on writing stuff to HOME.
+                    (setenv "HOME" "/tmp")
+                    (invoke "avocado" "--show=all" "run" "tests/protocol.py"))
+                  (format #t "test suite not run~%")))))))
     (native-inputs
      (list python-avocado-framework
            python-setuptools-scm
-- 
2.41.0

[bug#70855] [PATCH 89/92] gnu: python-qemu-qmp: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/virtualization.scm (python-qemu-qmp):
  [build-system]: Move to pyproject-build-system.

Change-Id: I4a11e7c913092a4798b46347388a0f07bbb85213
---
 gnu/packages/virtualization.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 0b46281050d..5f1148b7430 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2016,7 +2016,7 @@ (define-public python-qemu-qmp
        (uri (pypi-uri "qemu.qmp" version))
        (sha256
         (base32 "1rpsbiwvngij6fjcc5cx1azcc4dxmm080crr31wc7jrm7i61p7c2"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      (list
       #:phases
-- 
2.41.0

[bug#70855] [PATCH 90/92] gnu: python-cssselect2: Move to pyproject-build-system.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (python-cssselect2):
  [build-system]: Move to pyproject-build-system.
  [arguments]<#:phases>: Remove uneeded 'check phase replacement.

Change-Id: I0bdcf546d24bd738d5c547c36faa91483408d1ab
---
 gnu/packages/python-web.scm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 5f07b3cfc50..05413fd2e7e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5930,7 +5930,7 @@ (define-public python-cssselect2
        (uri (pypi-uri "cssselect2" version))
        (sha256
         (base32 "1j2fcr217rsvkipsg6zjq03rl64rxnvb5hqqpx0dv58fhspvkywk"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -5941,11 +5941,7 @@ (define-public python-cssselect2
                (("'pytest-flake8',") "")
                (("'pytest-isort',") "")
                (("--flake8") "")
-               (("--isort") ""))))
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (lambda _ (invoke "pytest"))))))))
+               (("--isort") "")))))))
     (propagated-inputs
      (list python-tinycss2))
     (native-inputs
-- 
2.41.0

[bug#70855] [PATCH 91/92] gnu: python-notebook: Add python-jupyter-server native-input.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-notebook):
  [native-inputs]: Add python-jupyter-server.

Change-Id: I742712482982e33f997af31b6936633d568b0e29
---
 gnu/packages/python-xyz.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 90d43de60c1..614ff9b23c3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -17602,6 +17602,7 @@ (define-public python-notebook
            python-traitlets))
     (native-inputs
      (list python-coverage
+           python-jupyter-server
            python-nbval
            python-pytest
            python-pytest-cov
-- 
2.41.0

[bug#70855] [PATCH 92/92] build-system/pyproject: Add missing native-inputs.

[Nicolas Graves via Guix-patches via]

* gnu/packages/astronomy.scm (python-drms, python-spherical-geometry,
python-asdf-coordinates-schemacs, python-asdf-wcs-schemas, python-rad)
[native-inputs]: Add python-setuptools and python-wheel.
(python-casa-formats-io, python-tweakwcs)[native-inputs]: Add
python-setuptools.

* gnu/packages/bioinformatics.scm (python-ega-download-client)
[native-inputs]: Add python-setuptools and python-wheel.

* gnu/packages/databases.scm (datasette)[native-inputs]: Add
python-pip.

* gnu/packages/django.scm (python-django-localflavor,
python-django-contact-form)[native-inputs]: Add python-setuptools and
python-wheel.

* gnu/packages/graphviz.scm (python-uqbar)[native-inputs]: Add
python-setuptools and python-wheel.

* gnu/packages/jupyter.scm (python-jupyterlab-server)[native-inputs]:
Add python-wheel.
(python-nbstripout)[native-inputs]: Add python-setuptools and
python-wheel.

* gnu/packages/machine-learning.scm (python-captum,
python-linear-operator, python-gpytorch)[native-inputs]: Add
python-setuptools.

* gnu/packages/music.scm (abjad, abjad-ext-rmarkers,
abjed-ext-nauert, python-mutagen)[native-inputs]: Add
python-setuptools and python-wheel.

* gnu/packages/package-management.scm
(python-conda-package-handling)[native-inputs]: Add python-setuptools
and python-wheel.
(conda)[native-inputs]: Add python-wheel.

* gnu/packages/python-check.scm (python-pyinstrument,
python-pytest-testmon, python-pytest-trio, python-nbval,
python-pytest-toolbox)[native-inputs]: Add python-setuptools and
python-wheel.
(python-nptyping)[native-inputs]: Add python-setuptools.

* gnu/packages/python-check.scm (python-dask-expr)[native-inputs]:
Add python-setuptools and python-wheel.

* gnu/packages/python-web.scm (parfive, python-aioftp, python-hupper,
python-sanic, python-mechanicalsoup, python-tinycss, python-aiostream,
python-cbor2, gunicorn)[native-inputs]: Add python-setuptools and
python-wheel.

* gnu/packages/python-xyz.scm (python-apprise, python-jaraco-classes,
python-sparse, python-shtab, python-pyan3)[native-inputs]: Add
python-setuptools.
(python-jupytext, python-orderedmultidict, python-ukkonen,
python-identify, python-nodeenv, python-cfgv, python-zarr,
python-multipart, python-nbconvert, python-cram, python-immutables,
python-numpydoc, python-cairosvg, python-unidecode, python-black,
python-multidict, python-mpv-jsonipc, python-humanize,
python-cmd2)[native-inputs]: Add python-setuptools and python-wheel.
(python-partd, python-dask, python-zarr)[native-inputs]: Add
python-wheel.
(python-nbconvert)[propagated-inputs]: Add texlive-etoolbox. Remove
duplicate textlive-jknapltx.
(python-isort)[native-inputs]: Add python-pip.

* gnu/packages/simulation.scm (python-fenics-dijitso)[native-inputs]:
Add python-setuptools and python-wheel.

* gnu/packages/sphinx.scm (python-pydata-sphinx-theme,
python-sphinx-autodoc-typehints)[native-inputs]: Add
python-setuptools.

* gnu/packages/syndication.scm (tuir)[native-inputs]: Add
python-setuptools and python-wheel.

* gnu/packages/terminals.scm (python-halo)[native-inputs]: Add
python-setuptools and python-wheel.

* gnu/packages/time.scm (python-arrow, python-dateutil)
[native-inputs]: Add python-setuptools and python-wheel.

* gnu/packages/version-control.scm (pre-commit)[native-inputs]: Add
python-setuptools and python-wheel.

* gnu/packages/virtualization.scm (python-qemu-qmp,
python-transient)[native-inputs]: Add python-setuptools and
python-wheel.

* gnu/packages/xorg.scm (python-xcffib)[native-inputs]: Add
python-setuptools and python-wheel.

Change-Id: Id61cf8cdc47bd4c2871c0a9c8e9a5bfd51157df0
---
 gnu/packages/astronomy.scm          | 25 +++++++----
 gnu/packages/bioinformatics.scm     |  9 +++-
 gnu/packages/databases.scm          |  1 +
 gnu/packages/django.scm             |  2 +
 gnu/packages/graphviz.scm           |  4 +-
 gnu/packages/jupyter.scm            |  7 +++-
 gnu/packages/machine-learning.scm   |  4 +-
 gnu/packages/music.scm              | 10 ++---
 gnu/packages/package-management.scm | 12 ++++--
 gnu/packages/python-check.scm       | 17 +++++---
 gnu/packages/python-science.scm     |  4 +-
 gnu/packages/python-web.scm         | 46 +++++++++++++++------
 gnu/packages/python-xyz.scm         | 64 +++++++++++++++++++----------
 gnu/packages/simulation.scm         |  2 +-
 gnu/packages/sphinx.scm             |  4 +-
 gnu/packages/syndication.scm        |  4 +-
 gnu/packages/terminals.scm          |  2 +-
 gnu/packages/time.scm               | 10 +++--
 gnu/packages/version-control.scm    |  2 +
 gnu/packages/virtualization.scm     |  9 ++--
 gnu/packages/xorg.scm               |  4 +-
 21 files changed, 169 insertions(+), 73 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index de5193d9b83..32c6f30e8f6 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2041,7 +2041,8 @@ (define-public python-casa-formats-io
             (lambda _
               (invoke "python" "setup.py" "build_ext" "--inplace"))))))
     (native-inputs
-     (list python-pytest python-pytest-cov python-pytest-openfiles))
+     (list python-pytest python-pytest-cov python-pytest-openfiles
+           python-setuptools))
     (propagated-inputs
      (list python-astropy python-click python-dask python-numpy))
     (home-page "https://casa-formats-io.readthedocs.io/")
@@ -2254,9 +2255,11 @@ (define-public python-drms
     (build-system pyproject-build-system)
     (native-inputs
      (list python-astropy
-           python-pytest-astropy
            python-pytest
-           python-setuptools-scm))
+           python-pytest-astropy
+           python-setuptools
+           python-setuptools-scm
+           python-wheel))
     (propagated-inputs (list python-numpy python-pandas))
     (home-page "https://sunpy.org")
     (synopsis "Access astronomical HMI, AIA and MDI data with Python")
@@ -3230,7 +3233,9 @@ (define-public python-spherical-geometry
     (native-inputs
      (list python-pytest
            python-pytest-astropy-header
-           python-setuptools-scm))
+           python-setuptools
+           python-setuptools-scm
+           python-wheel))
     (inputs
      (list qd))
     (propagated-inputs
@@ -4607,6 +4612,7 @@ (define-public python-tweakwcs
            python-pytest
            python-pytest-cov
            python-scipy
+           python-setuptools
            python-setuptools-scm))
     (home-page "https://tweakwcs.readthedocs.io/en/latest/")
     (synopsis
@@ -4800,7 +4806,9 @@ (define python-asdf-coordinates-schemas
     (native-inputs
      (list python-pytest
            python-pytest-xdist
-           python-setuptools-scm))
+           python-setuptools
+           python-setuptools-scm
+           python-wheel))
     (propagated-inputs
      (list python-asdf))
     (home-page "https://github.com/asdf-format/asdf-coordinates-schemas")
@@ -4986,7 +4994,9 @@ (define python-asdf-wcs-schemas
      (list python-asdf
            python-pytest
            python-pytest-openfiles
-           python-setuptools-scm))
+           python-setuptools
+           python-setuptools-scm
+           python-wheel))
     (propagated-inputs
      (list python-asdf-coordinates-schemas
            python-asdf-standard
@@ -5053,7 +5063,8 @@ (define-public python-rad
       ;; python-rad -> python-roman-datamodels -> python-crds -> python-rad
       #:test-flags #~(list "--ignore=tests/test_schemas.py")))
     (native-inputs
-     (list python-pytest python-setuptools-scm))
+     (list python-pytest python-setuptools
+           python-setuptools-scm python-wheel))
     (propagated-inputs (list python-asdf python-asdf-astropy))
     (home-page "https://github.com/spacetelescope/rad")
     (synopsis "Roman Attribute Dictionary")
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 47cca108658..a611caf715a 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2771,8 +2771,13 @@ (define-public python-ega-download-client
                (("==") ">=")))))))
     (propagated-inputs (list python-htsget python-psutil python-requests
                              python-tqdm python-urllib3))
-    (native-inputs (list python-coverage python-pytest python-pyfakefs
-                         python-responses python-mock))
+    (native-inputs (list python-coverage
+                         python-mock
+                         python-pyfakefs
+                         python-pytest
+                         python-responses
+                         python-setuptools
+                         python-wheel))
     (home-page "https://github.com/EGA-archive/ega-download-client")
     (synopsis "EGA download client")
     (description "PyEGA3 is a tool for viewing and downloading files from
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index a3a550c40c3..67e6ced7c32 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -5571,6 +5571,7 @@ (define-public datasette
      (list python-beautifulsoup4
            python-black
            python-cogapp
+           python-pip
            python-pytest
            python-pytest-asyncio
            python-pytest-runner
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 21099f0ff0f..4a271eaf0b5 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -294,6 +294,8 @@ (define-public python-django-localflavor
               (if tests?
                   (apply invoke "python" "-m" "django" "test" test-flags)
                   (format #t "test suite not run~%")))))))
+    (native-inputs
+     (list python-setuptools python-wheel))
     (propagated-inputs
      (list python-django python-stdnum))
     (home-page "https://django-localflavor.readthedocs.io/en/latest/")
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index 2c23b6abd5c..db40b99928a 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -221,7 +221,9 @@ (define-public python-uqbar
            python-isort
            python-mypy
            python-pytest
-           python-pytest-cov))
+           python-pytest-cov
+           python-setuptools
+           python-wheel))
     (propagated-inputs
      (list python-black python-sphinx-5 python-unidecode
            (package/inherit python-sphinx-rtd-theme
diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index cf3fa509966..e2bef079ba0 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -409,7 +409,8 @@ (define-public python-jupyterlab-server
            python-requests-mock
            python-ruamel.yaml
            python-strict-rfc3339
-           python-werkzeug))
+           python-werkzeug
+           python-wheel))
     (home-page "https://jupyter.org")
     (synopsis "Server components for JupyterLab applications")
     (description "JupyterLab Server sits between JupyterLab and Jupyter
@@ -819,7 +820,9 @@ (define-public python-nbstripout
      (list python-pytest
            python-pytest-cram
            python-pytest-flake8
-           python-pytest-runner))
+           python-pytest-runner
+           python-setuptools
+           python-wheel))
     (home-page "https://github.com/kynan/nbstripout")
     (synopsis "Strips outputs from Jupyter and IPython notebooks")
     (description
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 21d58d9aae9..ba6f51b3f11 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -4535,7 +4535,7 @@ (define-public python-captum
                          python-parameterized
                          python-pytest
                          python-pytest-cov
-                         python-scikit-learn))
+                         python-setuptools))
     (home-page "https://captum.ai")
     (synopsis "Model interpretability for PyTorch")
     (description "Captum is a model interpretability and understanding library
@@ -5114,6 +5114,7 @@ (define-public python-linear-operator
     (native-inputs (list python-flake8
                          python-flake8-print
                          python-pytest
+                         python-setuptools
                          python-setuptools-scm
                          python-twine))
     (home-page "https://github.com/cornellius-gp/linear_operator/")
@@ -5146,6 +5147,7 @@ (define-public python-gpytorch
                          python-flake8-print
                          python-nbval
                          python-pytest
+                         python-setuptools
                          python-twine))
     (home-page "https://gpytorch.ai")
     (synopsis "Implementation of Gaussian Processes in PyTorch")
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 37fe94b56de..6b765dcb3d6 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1698,7 +1698,7 @@ (define-public abjad
     (inputs
      (list lilypond))
     (native-inputs
-     (list python-pytest))
+     (list python-pytest python-setuptools python-wheel))
     (propagated-inputs
      (list python-quicktions
            python-ply
@@ -1730,7 +1730,7 @@ (define-public abjad-ext-rmakers
         (base32 "1y8s55b4mlsigm0xkk6qjpp08c75rv0swvjp0lj3cs6lgqdjxdjl"))))
     (build-system pyproject-build-system)
     (native-inputs
-     (list lilypond python-pytest))
+     (list lilypond python-pytest python-setuptools python-wheel))
     (propagated-inputs
      (list abjad))
     (home-page "https://abjad.github.io")
@@ -1755,7 +1755,7 @@ (define-public abjad-ext-nauert
         (base32 "0j4pf4h27jm3df0dn2rwkdx6zqcxvr7pqchbaa9rffz7q4hbakmf"))))
     (build-system pyproject-build-system)
     (native-inputs
-     (list lilypond python-pytest))
+     (list lilypond python-pytest python-setuptools python-wheel))
     (propagated-inputs
      (list abjad))
     (home-page "https://abjad.github.io")
@@ -3978,8 +3978,8 @@ (define-public python-mutagen
                  (("( +)@given" all spaces)
                   (string-append spaces "@settings(deadline=None)\n" all))))))))
     (native-inputs
-     (list python-pytest python-hypothesis python-flake8))
-    (home-page "https://mutagen.readthedocs.io/")
+     (list python-pytest python-hypothesis python-flake8
+           python-setuptools python-wheel))
     (synopsis "Read and write audio tags")
     (description "Mutagen is a Python module to handle audio metadata.  It
 supports ASF, FLAC, M4A, Monkey’s Audio, MP3, Musepack, Ogg FLAC, Ogg Speex, Ogg
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 949c42e274b..feed16ebcef 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1143,8 +1143,13 @@ (define-public python-conda-package-handling
     (inputs
      (list libarchive))
     (native-inputs
-     (list python-cython python-pytest python-pytest-cov
-           python-pytest-mock python-mock))
+     (list python-cython
+           python-mock
+           python-pytest
+           python-pytest-cov
+           python-pytest-mock
+           python-setuptools
+           python-wheel))
     (home-page "https://conda.io")
     (synopsis "Create and extract conda packages of various formats")
     (description
@@ -1284,7 +1289,8 @@ (define-public conda
      (list python-coverage
            python-flaky
            python-pytest-timeout
-           python-pytest-xprocess))
+           python-pytest-xprocess
+           python-wheel))
     (home-page "https://github.com/conda/conda")
     (synopsis "Cross-platform, OS-agnostic, system-level binary package manager")
     (description
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 46c8b3414e4..5571cee2088 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -377,7 +377,9 @@ (define-public python-pyinstrument
            python-greenlet
            python-pytest
            python-pytest-asyncio
-           python-pytest-trio))
+           python-pytest-trio
+           python-setuptools
+           python-wheel))
     (home-page "https://github.com/joerick/pyinstrument")
     (synopsis "Call stack profiler for Python")
     (description
@@ -1169,7 +1171,8 @@ (define-public python-pytest-testmon
         (base32 "01qhbkb3n8c5c4id94w6b06q9wb7b6a33mqwyrkdfzk5pzv1gcyd"))))
     (build-system pyproject-build-system)
     (arguments (list #:tests? #false)) ;there are none
-    (native-inputs (list python-coverage python-pytest))
+    (native-inputs (list python-coverage python-pytest
+                         python-setuptools python-wheel))
     (home-page "https://github.com/tarpas/pytest-testmon")
     (synopsis "Selects tests affected by changed files and methods")
     (description
@@ -1198,7 +1201,8 @@ (define-public python-pytest-trio
                            ;; No keyboard interrupt in our build environment.
                            " and not test_actual_test"))))
     (native-inputs
-     (list python-hypothesis python-pytest python-pytest-cov))
+     (list python-hypothesis python-pytest python-pytest-cov
+           python-setuptools python-wheel))
     (propagated-inputs
       (list python-async-generator python-outcome python-pytest python-trio))
     (home-page "https://github.com/python-trio/pytest-trio")
@@ -1487,7 +1491,8 @@ (define-public python-pytest-toolbox
                 (substitute* "setup.cfg"
                   ((".*timeout.*") ""))))))))
     (native-inputs
-     (list python-pydantic python-pytest python-pytest-isort))
+     (list python-pydantic python-pytest python-pytest-isort
+           python-setuptools python-wheel))
     (home-page "https://github.com/samuelcolvin/pytest-toolbox")
     (synopsis "Numerous useful plugins for Pytest")
     (description
@@ -1585,7 +1590,8 @@ (define-public python-nbval
               (delete-file "tests/\
 ipynb-test-samples/test-latex-pass-correctouput.ipynb"))))))
     (native-inputs
-     (list python-pytest python-pytest-cov python-sympy))
+     (list python-pytest python-pytest-cov python-setuptools python-sympy
+           python-wheel))
     (propagated-inputs
      (list python-ipykernel python-jupyter-client python-nbformat
            python-six python-coverage))
@@ -2062,6 +2068,7 @@ (define-public python-nptyping
     (native-inputs
      (list python-beartype
            python-mypy
+           python-setuptools
            python-typeguard
            python-wheel))
     (propagated-inputs (list python-numpy python-typing-extensions))
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index dd4cffea8e1..f82feab0963 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -2157,7 +2157,9 @@ (define-public python-dask-expr
      ;; package without creating a mutually recursive dependency.
      (list python-dask/bootstrap
            python-pytest
-           python-versioneer))
+           python-setuptools
+           python-versioneer
+           python-wheel))
     (home-page "https://github.com/dask/dask-expr")
     (synopsis "Dask DataFrames with query optimization")
     (description "This is a rewrite of Dask DataFrame that includes query
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 05413fd2e7e..61ea8a63558 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -684,10 +684,12 @@ (define-public python-aiostream
                 "0l2ijb7yk0820wiyf6zrzx8fhzf8925an7r06mcaw3in1mr6rssq"))))
     (build-system python-build-system)
     (native-inputs
-     (list python-pytest
+     (list python-setuptools
+           python-pytest
            python-pytest-asyncio
            python-pytest-cov
-           python-pytest-runner))
+           python-pytest-runner
+           python-wheel))
     (home-page "https://github.com/vxgmichel/aiostream")
     (synopsis "Generator-based operators for asynchronous iteration")
     (description "@code{aiostream} provides a collection of stream operators that can
@@ -1001,7 +1003,11 @@ (define-public python-cbor2
        (sha256
         (base32 "15y78xcc3zkmvj1mdzz8gyhf3apbl91073kwhzbjk5abc1civwlw"))))
     (build-system pyproject-build-system)
-    (native-inputs (list python-pytest python-pytest-cov python-setuptools-scm))
+    (native-inputs (list python-pytest
+                         python-pytest-cov
+                         python-setuptools
+                         python-setuptools-scm
+                         python-wheel))
     (home-page "https://github.com/agronholm/cbor2")
     (synopsis "Concise Binary Object Representation (CBOR) (de)serializer")
     (description "This Python library provides encoding and decoding for the
@@ -1407,7 +1413,9 @@ (define-public parfive
                          python-pytest-cov
                          python-pytest-localserver
                          python-pytest-socket
-                         python-setuptools-scm))
+                         python-setuptools
+                         python-setuptools-scm
+                         python-wheel))
     (home-page "https://parfive.readthedocs.io/")
     (synopsis "HTTP and FTP parallel file downloader")
     (description
@@ -1594,7 +1602,9 @@ (define-public python-mechanicalsoup
            python-pytest-httpbin
            python-pytest-mock
            python-pytest-runner
-           python-requests-mock))
+           python-requests-mock
+           python-setuptools
+           python-wheel))
     (home-page "https://mechanicalsoup.readthedocs.io/")
     (synopsis "Python library for automating website interaction")
     (description
@@ -3813,9 +3823,13 @@ (define-public python-aioftp
                (base32
                 "0w621mg956m9rn7v39jpwi4gpnpl90pprwl29cp640dahqqv38ms"))))
     (build-system pyproject-build-system)
-    (native-inputs (list python-async-timeout python-pytest
-                         python-pytest-asyncio python-pytest-cov
-                         python-trustme))
+    (native-inputs (list python-async-timeout
+                         python-pytest
+                         python-pytest-asyncio
+                         python-pytest-cov
+                         python-setuptools
+                         python-trustme
+                         python-wheel))
     (propagated-inputs (list python-siosocks))
     (home-page "https://aioftp.readthedocs.io/")
     (synopsis "FTP client/server for asyncio in Python")
@@ -5874,7 +5888,7 @@ (define-public python-tinycss
            '(list "-k" "not test_speedups")))
     (native-inputs
      (list python-pytest-cov python-pytest-flake8 python-pytest-isort
-           python-pytest-runner))
+           python-pytest-runner python-setuptools python-wheel))
     (home-page "https://tinycss.readthedocs.io/")
     (synopsis "Complete yet simple CSS parser for Python")
     (description
@@ -6074,6 +6088,7 @@ (define-public gunicorn
            python-pytest-cov
            python-sphinx
            texinfo))
+    (propagated-inputs (list python-packaging python-setuptools python-wheel))
     (home-page "https://gunicorn.org/")
     (synopsis "Python WSGI HTTP Server for UNIX")
     (description "Gunicorn ‘Green Unicorn’ is a Python WSGI HTTP
@@ -6866,8 +6881,13 @@ (define-public python-hupper
     (build-system python-build-system)
     (arguments '(#:test-target "pytest"))
     (native-inputs
-     (list python-pytest python-pytest-runner python-watchdog python-mock
-           python-pytest-cov))
+     (list python-mock
+           python-pytest
+           python-pytest-cov
+           python-pytest-runner
+           python-setuptools
+           python-watchdog
+           python-wheel))
     (propagated-inputs
      (list python-pytz))
     (home-page "https://readthedocs.org/projects/hupper")
@@ -7618,11 +7638,13 @@ (define-public python-sanic
            python-pytest-benchmark
            python-pytest-sanic
            python-sanic-testing
+           python-setuptools
            python-slotscheck
            python-towncrier
            python-tox
            python-types-ujson
-           python-uvicorn))
+           python-uvicorn
+           python-wheel))
     (home-page "https://github.com/sanic-org/sanic/")
     (synopsis "Async Python web server/framework")
     (description
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 614ff9b23c3..3f86ea8224b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -326,6 +326,7 @@ (define-public python-apprise
                          python-pytest-cov
                          python-pytest-mock
                          python-pytest-xdist
+                         python-setuptools
                          python-wheel))
     (arguments
      (list
@@ -483,8 +484,10 @@ (define-public python-jupytext
            python-isort
            python-ipython-genutils
            python-jupyter-server
+           python-pyaml
            python-pytest
-           python-pyaml))
+           python-setuptools
+           python-wheel))
     (propagated-inputs
      (list python-markdown-it-py
            python-mdit-py-plugins
@@ -5957,6 +5960,7 @@ (define-public python-unidecode
               (base32
                "1x620s4dk4d501pivhlfzbi2d1r5fnm9cssqwkn76f7d8sfk9nyg"))))
     (build-system pyproject-build-system)
+    (native-inputs (list python-setuptools python-wheel))
     (home-page "https://pypi.org/project/Unidecode/")
     (synopsis "ASCII transliterations of Unicode text")
     (description
@@ -8260,7 +8264,8 @@ (define-public python-black
            python-typed-ast
            python-typing-extensions))
     (native-inputs
-     (list python-pytest python-pytest-aiohttp python-setuptools-scm))
+     (list python-pytest python-pytest-aiohttp python-setuptools
+           python-setuptools-scm python-wheel))
     (home-page "https://github.com/psf/black")
     (synopsis "The uncompromising code formatter")
     (description "Black is the uncompromising Python code formatter.")
@@ -8734,7 +8739,7 @@ (define-public python-sparse
      (list python-numba python-numpy python-scipy))
     (native-inputs
      (list python-dask python-importlib-metadata python-pytest
-           python-pytest-black python-pytest-cov))
+           python-pytest-black python-pytest-cov python-setuptools))
     (home-page "https://github.com/pydata/sparse/")
     (synopsis "Library for multi-dimensional sparse arrays")
     (description
@@ -9189,7 +9194,9 @@ (define-public python-numpydoc
                   ;; TODO: unclear why these fail.
                   "-k" "not test_MyClass and not test_my_function")))
     (propagated-inputs (list python-jinja2 python-sphinx))
-    (native-inputs (list python-matplotlib python-pytest python-pytest-cov))
+    (native-inputs
+     (list python-matplotlib python-pytest python-pytest-cov
+           python-setuptools python-wheel))
     (home-page "https://pypi.org/project/numpydoc/")
     (synopsis "Numpy's Sphinx extensions")
     (description "Sphinx extension to support docstrings in Numpy format.")
@@ -9908,7 +9915,7 @@ (define-public python-multidict
          "1kjrxav572j45xvr1iy60zb2g8zqvrinzdkl4ax36js4vczckl8d"))))
     (build-system pyproject-build-system)
     (native-inputs
-     (list python-pytest python-pytest-cov))
+     (list python-pytest python-pytest-cov python-setuptools python-wheel))
     (home-page "https://github.com/aio-libs/multidict/")
     (synopsis "Multidict implementation")
     (description "Multidict is dict-like collection of key-value pairs
@@ -9929,7 +9936,7 @@ (define-public python-orderedmultidict
     (propagated-inputs
      (list python-six))
     (native-inputs
-     (list python-flake8 python-pycodestyle))
+     (list python-flake8 python-pycodestyle python-setuptools python-wheel))
     (home-page "https://github.com/gruns/orderedmultidict")
     (synopsis "Python Ordered Multivalue Dictionary - omdict")
     (description "This package contains a library for ordered multivalue
@@ -11711,6 +11718,7 @@ (define-public python-jaraco-classes
            python-pytest-cov
            python-pytest-flake8
            python-pytest-mypy
+           python-setuptools
            python-setuptools-scm
            python-wheel))
     (propagated-inputs (list python-more-itertools))
@@ -15114,7 +15122,7 @@ (define-public python-cram
              (invoke "make" "test"))))))
     (build-system python-build-system)
     (native-inputs
-     (list python-coverage which))
+     (list python-coverage python-setuptools python-wheel which))
     (synopsis "Simple testing framework for command line applications")
     (description
      "Cram is a functional testing framework for command line applications.
@@ -15858,8 +15866,9 @@ (define-public python-immutables
        (uri (pypi-uri "immutables" version))
        (sha256
         (base32 "1x4cinh0xbl6p6p2yfm2s07mxxy3lf0zzai9gqpydk4482bwfdjk"))))
-    (build-system python-build-system)
-    (native-inputs (list python-mypy python-pytest))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-mypy python-pytest
+                         python-setuptools python-wheel))
     (home-page "https://github.com/MagicStack/immutables")
     (synopsis "High-performance immutable mapping type for Python")
     (description
@@ -17494,6 +17503,7 @@ (define-public python-nbconvert
            texlive-collection-basic
            texlive-enumitem
            texlive-environ
+           texlive-etoolbox
            texlive-eurosym
            texlive-etoolbox
            texlive-fancyvrb
@@ -17504,7 +17514,6 @@ (define-public python-nbconvert
            texlive-hyperref
            texlive-infwarerr
            texlive-jknapltx
-           texlive-jknapltx
            texlive-kvoptions
            texlive-lm
            texlive-lm-math
@@ -24199,6 +24208,7 @@ (define-public python-isort
            python-hypothesmith
            python-libcst-minimal
            python-natsort
+           python-pip
            python-poetry-core
            python-pylama
            python-pypa-build
@@ -26954,6 +26964,7 @@ (define-public python-mpv-jsonipc
        (sha256
         (base32 "0ymdwrx544a6gn6wm9dixpgzbfrbpxvcj5ys7m41cgb4lvpvx691"))))
     (build-system pyproject-build-system)
+    (native-inputs (list python-setuptools python-wheel))
     (home-page "https://github.com/iwalton3/python-mpv-jsonipc")
     (synopsis "Python API to control MPV using JSON IPC")
     (description "Python MPV JSONIPC implements an interface similar to
@@ -27569,7 +27580,7 @@ (define-public python-ukkonen
        (sha256
         (base32 "17gspl2dsykg000275svvyam4k7wz9ypi9xrfrmsgcgryczravlc"))))
     (build-system pyproject-build-system)
-    (native-inputs (list python-pytest))
+    (native-inputs (list python-pytest python-setuptools python-wheel))
     (propagated-inputs (list python-cffi))
     (home-page "https://github.com/asottile/ukkonen")
     (synopsis "Implementation of bounded Levenshtein distance (Ukkonen)")
@@ -27598,7 +27609,8 @@ (define-public python-identify
                    ;; system-error "utime" "~A" ("No such file or directory")
                    (delete 'ensure-no-mtimes-pre-1980))))
     (native-inputs
-     (list python-coverage python-pytest python-ukkonen))
+     (list python-coverage python-pytest python-setuptools
+           python-ukkonen python-wheel))
     (propagated-inputs
      (list python-editdistance))
     (home-page "https://github.com/chriskuehl/identify")
@@ -27694,7 +27706,8 @@ (define-public python-nodeenv
                          "not test_smoke"
                          " and not test_smoke_n_system_special_chars"))))
     (native-inputs
-     (list python-coverage python-mock python-pytest))
+     (list python-coverage python-mock python-pytest
+           python-setuptools python-wheel))
     (home-page "https://ekalinin.github.io/nodeenv/")
     (synopsis "Create isolated node.js environments")
     (description
@@ -27795,7 +27808,7 @@ (define-public python-cfgv
         (base32 "0g7jg6dssyax6k85lk8afs8qdzgq138g6ij0jmmhgdv5fzks6k9z"))))
     (build-system pyproject-build-system)
     (native-inputs
-     (list python-pytest))
+     (list python-pytest python-setuptools python-wheel))
     (home-page "https://github.com/asottile/cfgv")
     (synopsis "Configuration validation library")
     (description
@@ -28004,7 +28017,8 @@ (define-public python-zarr
            python-pytest-doctestplus
            python-pytest-timeout
            python-pytest-xdist
-           python-setuptools-scm))
+           python-setuptools-scm
+           python-wheel))
     (home-page "https://github.com/zarr-developers/zarr-python")
     (synopsis "Chunked, compressed, N-dimensional arrays for Python")
     (description
@@ -28438,7 +28452,7 @@ (define-public python-partd
     (build-system pyproject-build-system)
     (propagated-inputs
      (list python-locket python-numpy python-pandas python-pyzmq python-toolz))
-    (native-inputs (list python-setuptools))
+    (native-inputs (list python-setuptools python-wheel))
     (home-page "https://github.com/dask/partd/")
     (synopsis "Appendable key-value storage")
     (description "Partd stores key-value pairs.  Values are raw bytes.  We
@@ -28588,7 +28602,8 @@ (define-public python-dask
            python-pytest-rerunfailures
            python-pytest-runner
            python-pytest-xdist
-           python-versioneer))
+           python-versioneer
+           python-wheel))
     (home-page "https://github.com/dask/dask/")
     (synopsis "Parallel computing with task scheduling")
     (description
@@ -29164,7 +29179,7 @@ (define-public python-humanize
           "006vpl19bffy9fn0sssxbfakcvgrx7fhvy6l515fzln7vwpqf7zf"))))
     (build-system pyproject-build-system)
     (native-inputs
-     (list python-freezegun python-pytest))
+     (list python-freezegun python-setuptools python-pytest python-wheel))
     (home-page "https://github.com/jmoiron/humanize")
     (synopsis "Print numerical information in a human-readable form")
     (description "This package provides a Python module that displays numbers
@@ -29681,7 +29696,8 @@ (define-public python-cairosvg
      (list python-cairocffi python-cssselect2 python-defusedxml
            python-pillow python-tinycss2))
     (native-inputs
-     (list python-pytest-flake8 python-pytest-isort python-pytest-runner))
+     (list python-pytest-flake8 python-pytest-isort python-pytest-runner
+           python-setuptools python-wheel))
     (home-page "https://cairosvg.org/")
     (synopsis "SVG to PDF/PS/PNG converter based on Cairo")
     (description "CairoSVG is a SVG converter based on Cairo.  It can export
@@ -31724,7 +31740,9 @@ (define-public python-cmd2
            python-pytest
            python-pytest-cov
            python-pytest-mock
-           python-setuptools-scm))
+           python-setuptools
+           python-setuptools-scm
+           python-wheel))
     (home-page "https://github.com/python-cmd2/cmd2")
     (synopsis "Tool for building interactive command line applications")
     (description
@@ -33993,7 +34011,7 @@ (define-public python-pyan3
                                 "python-pyan3-fix-absolute-path-bug.patch"))))
     (build-system pyproject-build-system)
     (native-inputs
-     (list python-pytest python-pytest-cov python-wheel))
+     (list python-pytest python-pytest-cov python-setuptools python-wheel))
     (propagated-inputs
      (list python-jinja2))
     (home-page "https://github.com/Technologicat/pyan")
@@ -35495,7 +35513,8 @@ (define-public python-multipart
                 "0hzshd665rl1bkwvaj9va4j3gs8nmb478fbvligx20663xhmzfzp"))))
     (build-system python-build-system)
     (propagated-inputs (list python-six))
-    (native-inputs (list python-pyyaml python-mock python-pytest-cov))
+    (native-inputs (list python-mock python-pytest python-pytest-cov
+                         python-pyyaml python-setuptools python-wheel))
     (arguments
      `(#:phases (modify-phases %standard-phases
                   ;; There is a bug in the test_suit specification.
@@ -35583,6 +35602,7 @@ (define-public python-shtab
             python-pytest
             python-pytest-cov
             python-pytest-timeout
+            python-setuptools
             python-setuptools-scm
             python-wheel))
     (home-page "https://github.com/iterative/shtab")
diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm
index ed029efeac1..99c0a121dde 100644
--- a/gnu/packages/simulation.scm
+++ b/gnu/packages/simulation.scm
@@ -577,7 +577,7 @@ (define-public python-fenics-dijitso
     (inputs
      (list openmpi python-numpy))
     (native-inputs
-     (list python-pytest-cov))
+     (list python-pytest python-setuptools python-wheel))
     (propagated-inputs
      (list python-mpi4py))
     (arguments
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index e6668146849..c86ef1e5615 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -1153,9 +1153,11 @@ (define-public python-sphinx-autodoc-typehints
     (native-inputs
      (list python-nptyping
            python-pytest
+           python-setuptools
            python-setuptools-scm
            python-sphobjinv
-           python-typing-extensions))
+           python-typing-extensions
+           python-wheel))
     (home-page "https://pypi.org/project/sphinx-autodoc-typehints/")
     (synopsis "Type hints for the Sphinx autodoc extension")
     (description "This extension allows you to use Python 3 annotations for
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index d986e049ccf..a2d8c61be45 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -474,7 +474,9 @@ (define-public tuir
            python-mock
            python-pylint
            python-pytest
-           python-vcrpy))
+           python-vcrpy
+           python-setuptools
+           python-wheel))
     (home-page "https://gitlab.com/ajak/tuir")
     (synopsis "Terminal viewer for Reddit (Terminal UI for Reddit)")
     (description
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 203254490ef..98a6bf6684a 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1197,7 +1197,7 @@ (define-public python-halo
     (propagated-inputs (list python-colorama python-log-symbols python-six
                              python-spinners python-termcolor))
     (native-inputs (list python-coverage python-nose python-pylint python-tox
-                         python-twine))
+                         python-twine python-setuptools python-wheel))
     (home-page "https://github.com/manrajgrover/halo")
     (synopsis "Python library to display graphical spinners in the terminal")
     (description "Halo is a Python library to display graphical spinners in
diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm
index 552ac346c4a..d91058b378f 100644
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@ -252,7 +252,8 @@ (define-public python-dateutil
                      ;; XXX: Fails to get timezone from /etc/localtime.
                      "--ignore=dateutil/test/test_tz.py")))
     (native-inputs
-     (list python-pytest python-pytest-cov python-setuptools-scm))
+     (list python-pytest python-pytest-cov python-setuptools
+           python-setuptools-scm python-wheel))
     (propagated-inputs
      (list python-six))
     (home-page "https://dateutil.readthedocs.io/en/stable/")
@@ -508,13 +509,14 @@ (define-public python-arrow
                           ;; Remove when python-dateutil > 2.8.1.
                           "-k" "not test_parse_tz_name_zzz")))
     (native-inputs
-     (list ;; For testing
-           python-chai
+     (list python-chai
            python-pytest
            python-pytest-cov
            python-pytest-mock
            python-pytz
-           python-simplejson))
+           python-setuptools
+           python-simplejson
+           python-wheel))
     (propagated-inputs
      (list python-dateutil))
     (home-page "https://github.com/arrow-py/arrow")
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 226bcd4ad63..bccc219f679 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2069,6 +2069,8 @@ (define-public pre-commit
            python-pytest
            python-pytest-env
            python-re-assert
+           python-setuptools
+           python-wheel
            which))
     ;; Propagate because pre-commit is also used as a module.
     (propagated-inputs
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 5f1148b7430..20cbb0b8bed 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2030,10 +2030,12 @@ (define-public python-qemu-qmp
                   (format #t "test suite not run~%")))))))
     (native-inputs
      (list python-avocado-framework
-           python-setuptools-scm
            python-flake8
            python-isort
-           python-pylint))
+           python-pylint
+           python-setuptools
+           python-setuptools-scm
+           python-wheel))
     (propagated-inputs
      (list python-pygments
            python-urwid
@@ -2807,7 +2809,8 @@ (define-public python-transient
            python-requests
            python-toml))
     (native-inputs
-     (list python-black python-mypy python-pyhamcrest python-twine))
+     (list python-black python-mypy python-pyhamcrest python-twine
+           python-setuptools python-wheel))
     (home-page "https://github.com/ALSchwalm/transient")
     (synopsis "QEMU Wrapper written in Python")
     (description
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 6c894fc45bf..f2fbec1b23d 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -109,6 +109,7 @@ (define-module (gnu packages xorg)
   #:use-module (gnu packages perl-check)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-compression)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-xyz)
@@ -1740,7 +1741,8 @@ (define-public python-xcffib
     (source (package-source xcffibgen))
     (build-system pyproject-build-system)
     (native-inputs
-     (list pkg-config which xcb-proto xcffibgen))
+     (list pkg-config python-setuptools python-wheel
+           which xcb-proto xcffibgen))
     (inputs
      (list libxcb))
     (propagated-inputs
-- 
2.41.0

bug#70855: [PATCH 00/92] python-team patches

[Nicolas Goaziou via Guix-patches via]

Hello,

Nicolas Graves <ngraves@ngraves.fr> writes:

> This patch series contains prerequisite patches for an upcoming series
> to remove unwanted python nativeinputs. It should go to the
> python-team branch, and contains various types of fixes or updates.

Thanks. I pushed all of this into python-team branch.

Regards,
-- 
Nicolas Goaziou