guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

12/18: guix: pyproject-build-system: Default configure-flags to empty di


From: guix-commits
Subject: 12/18: guix: pyproject-build-system: Default configure-flags to empty dictionary.
Date: Mon, 26 Feb 2024 15:43:23 -0500 (EST)

rekado pushed a commit to branch python-team
in repository guix.

commit 4b623c044fe94e479e905f4b6bb3b305fc19b94f
Author: Lars-Dominik Braun <lars@6xq.net>
AuthorDate: Sun Jul 30 13:36:37 2023 +0200

    guix: pyproject-build-system: Default configure-flags to empty dictionary.
    
    PEP 517 specifies it should be a dictionary and thus meson-python cannot
    handle an empty list.
    
    Fixes: <https://issues.guix.gnu.org/62781>
    
    * guix/build-system/pyproject.scm (lower): Change default of 
configure-flags.
    * gnu/packages/build-tools.scm (meson-python)[arguments]: Remove 
#:build-backend,
    which was a workaround for this bug.
    [native-inputs]: Remove python-p~a-build and python-wheel, which are
    not required when using the default build system.
    
    Change-Id: I240ced5c88cf55cbee0d6005d7657bfb6b653b12
---
 gnu/packages/build-tools.scm    | 10 ++--------
 guix/build-system/pyproject.scm |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 15d88ded80..de2f538f6f 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -355,10 +355,7 @@ resembles Python.")
                 "0vyjhjabvm41hqijifk33idbdl62i76kfyf884f9rs29rpp77nzx"))))
     (build-system pyproject-build-system)
     (arguments
-     ;; The project is configured to use itself to build ('mesonpy') and fails;
-     ;; use another PEP 517 build system.
-     (list #:build-backend "setuptools.build_meta"
-           #:test-flags #~(list "tests"
+     (list #:test-flags #~(list "tests"
                                 ;; The test_pep518 tries to install
                                 ;; dependencies from the network using pip.
                                 "-k" "not test_pep518")
@@ -379,10 +376,7 @@ resembles Python.")
            python-typing-extensions
            python-wheel))
     (native-inputs
-     (list python-pypa-build
-           python-wheel
-
-           ;; For tests.
+     (list ;; For tests.
            git-minimal/pinned
            patchelf
            pkg-config
diff --git a/guix/build-system/pyproject.scm b/guix/build-system/pyproject.scm
index 585117cbf0..c0e089eac7 100644
--- a/guix/build-system/pyproject.scm
+++ b/guix/build-system/pyproject.scm
@@ -93,7 +93,7 @@
 (define* (pyproject-build name inputs
                           #:key source
                           (tests? #t)
-                          (configure-flags ''())
+                          (configure-flags ''(@))
                           (backend-path #f)
                           (build-backend #f)
                           (test-backend #f)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]