From 93b40d330fc313e398a1aef4d73ade83d47650ad Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 17 Jan 2026 00:30:18 +0100 Subject: build-system/pyproject: Remove uneeded use of pyproject-guile-json. * gnu/packages/bioinformatics.scm (python-bed-reader, python-gseapy) * gnu/packages/chemistry.scm (gemmi, ringdecomposerlib, rdkit) * gnu/packages/cinnamon.scm (libxapp) * gnu/packages/cups.scm (hplip) * gnu/packages/djvu.scm (ocrodjvu) * gnu/packages/finance.scm (electron-cash) * gnu/packages/gnome.scm (terminator) * gnu/packages/image-processing.scm (insight-toolkit) * gnu/packages/machine-learning.scm (onnxruntime, tensorflow-lite, koboldcpp, python-tokenizers) * gnu/packages/maths.scm (gmsh, z3, fp16) * gnu/packages/music.scm (quodlibet) * gnu/packages/photo.scm (lensfun) * gnu/packages/python-science.scm (python-clarabel) * gnu/packages/python-xyz.scm (python-orjson, python-libcst, python-rpds-py, python-streamtracer, python-tiktoken) * gnu/packages/rpm.scm (createrepo-c) * gnu/packages/rust-apps.scm (maturin) * gnu/packages/sugar.scm (sugar, sugar-datastore) * gnu/packages/version-control.scm (mercurial, hg-commitsigs) * gnu/packages/vpn.scm (python-proton-vpn-local-agent) [arguments]<#:phases>: Remove uneeded use of pyproject-guile-json extension. * gnu/packages/python-xyz.scm (python-streamtracer)[arguments] <#:phases>: Also rewrite 'check phase replacement. Change-Id: I779c354120ada3d94f07a127b9ec5011e73254c2 Signed-off-by: Sharlatan Hellseher --- gnu/packages/python-xyz.scm | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d482b9324c5..b6c9da56401 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6367,12 +6367,11 @@ help formatter.") ((guix build pyproject-build-system) #:prefix py:) (guix build utils)) #:phases - (with-extensions (list (pyproject-guile-json)) #~(modify-phases %standard-phases (add-after 'build 'build-python-module (assoc-ref py:%standard-phases 'build)) (add-after 'build-python-module 'install-python-module - (assoc-ref py:%standard-phases 'install)))) + (assoc-ref py:%standard-phases 'install))) #:install-source? #false)) (inputs (cons maturin (cargo-inputs 'python-orjson))) @@ -22516,7 +22515,6 @@ members = [ ((guix build pyproject-build-system) #:prefix py:) (guix build utils)) #:phases - (with-extensions (list (pyproject-guile-json)) #~(modify-phases %standard-phases (add-after 'unpack 'prepare-source (lambda _ @@ -22541,7 +22539,7 @@ members = [ ;; #:test-flags '() ;; args))) (replace 'install - (assoc-ref py:%standard-phases 'install)))))) + (assoc-ref py:%standard-phases 'install))))) (native-inputs (list python-minimal-wrapper python-hypothesmith @@ -36162,12 +36160,11 @@ line by line or column by column or a combination of both.") ((guix build pyproject-build-system) #:prefix py:) (guix build utils)) #:phases - (with-extensions (list (pyproject-guile-json)) #~(modify-phases %standard-phases (add-after 'build 'build-python-module (assoc-ref py:%standard-phases 'build)) (add-after 'build-python-module 'install-python-module - (assoc-ref py:%standard-phases 'install)))) + (assoc-ref py:%standard-phases 'install))) #:install-source? #false)) (inputs (cons maturin (cargo-inputs 'python-rpds-py))) @@ -37023,7 +37020,6 @@ functionality and customization to your projects with their own plugins.") ((guix build pyproject-build-system) #:prefix py:) (guix build utils)) #:phases - (with-extensions (list (pyproject-guile-json)) #~(modify-phases %standard-phases (add-after 'build 'build-python-module (assoc-ref py:%standard-phases 'build)) @@ -37032,10 +37028,9 @@ functionality and customization to your projects with their own plugins.") (add-after 'install-python-module 'add-install-to-pythonpath (assoc-ref py:%standard-phases 'add-install-to-pythonpath)) (add-after 'check 'check-python-module - (lambda* (#:key tests? #:allow-other-keys) - (when tests? + (lambda args (with-directory-excursion #$output - (invoke "pytest" "-vv"))))))) + (apply (assoc-ref py:%standard-phases 'check) args))))) #:install-source? #false)) (native-inputs (list maturin @@ -38148,7 +38143,6 @@ to TIFF, BigTIFF, and ImageJ hyperstack compatible files.") ((guix build pyproject-build-system) #:prefix py:) (guix build utils)) #:phases - (with-extensions (list (pyproject-guile-json)) #~(modify-phases %standard-phases (replace 'build (assoc-ref py:%standard-phases 'build)) @@ -38162,7 +38156,7 @@ to TIFF, BigTIFF, and ImageJ hyperstack compatible files.") (assoc-ref py:%standard-phases 'create-entrypoints) (assoc-ref py:%standard-phases 'compile-bytecode))) (replace 'install - (assoc-ref py:%standard-phases 'install)))))) + (assoc-ref py:%standard-phases 'install))))) (propagated-inputs (list python-regex python-requests)) (inputs (cargo-inputs 'python-tiktoken)) (native-inputs -- cgit v1.3