[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/08: guix: pyproject-build-system: Default configure-flags to empty di
From: |
guix-commits |
Subject: |
08/08: guix: pyproject-build-system: Default configure-flags to empty dictionary. |
Date: |
Wed, 2 Aug 2023 06:38:41 -0400 (EDT) |
lbraun pushed a commit to branch pyproject-toml
in repository guix.
commit b3726639df72aa3943d8e403e3c2b9a6cde05421
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>
---
gnu/packages/build-tools.scm | 10 ++--------
gnu/packages/python-science.scm | 5 -----
guix/build-system/pyproject.scm | 2 +-
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index a365cca849..09a8a175e8 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -355,10 +355,7 @@ resembles Python.")
"1hpjw9qj6ff8ixjs0pz7qysc8v57jxgaf5n1p6bqm9bh3mc3wnrx"))))
(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")))
@@ -370,10 +367,7 @@ resembles Python.")
python-tomli
python-wheel))
(native-inputs
- (list python-pypa-build
- python-wheel
-
- ;; For tests.
+ (list ;; For tests.
git-minimal/pinned
patchelf
pkg-config
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 538a3c2f0e..47890389b5 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -93,11 +93,6 @@
(build-system pyproject-build-system)
(arguments
(list
- ;; FIXME: The default 'mesonpy' build system doesn't seem to work with
- ;; our pyproject-build-system, errors with: AttributeError: 'list'
- ;; object has no attribute 'items' (see:
- ;; https://issues.guix.gnu.org/62781).
- #:build-backend "setuptools.build_meta"
#:phases
#~(modify-phases %standard-phases
(replace 'check
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)
- branch pyproject-toml created (now b3726639df), guix-commits, 2023/08/02
- 02/08: build-system/python: Ignore symlinks when changing mtime., guix-commits, 2023/08/02
- 05/08: guix: toml: Add TOML parser., guix-commits, 2023/08/02
- 06/08: build-system/pyproject: Use TOML parser., guix-commits, 2023/08/02
- 01/08: build-system/pyproject: Use python-sans-pip-wrapper as default-python., guix-commits, 2023/08/02
- 03/08: gnu: criu: Change file mtimes to fix build., guix-commits, 2023/08/02
- 04/08: gnu: sssd: Change file mtimes to fix build., guix-commits, 2023/08/02
- 07/08: gnu: python-pytest-xdist: Disable failing test., guix-commits, 2023/08/02
- 08/08: guix: pyproject-build-system: Default configure-flags to empty dictionary.,
guix-commits <=