[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/222: guix: pyproject-build-system: Default configure-flags to empty d
From: |
guix-commits |
Subject: |
12/222: guix: pyproject-build-system: Default configure-flags to empty dictionary. |
Date: |
Fri, 1 Nov 2024 10:56:13 -0400 (EDT) |
sharlatan pushed a commit to branch python-team
in repository guix.
commit f1e106467e1f98fdf21d52ffe876e48f5640cdd5
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 21df25e4f5..a4eea70951 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -354,10 +354,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")
@@ -378,10 +375,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 7c16ba6573..bdf8f440ac 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)
- 18/222: gnu: python-typing-extensions: Update to 4.10.0., (continued)
- 18/222: gnu: python-typing-extensions: Update to 4.10.0., guix-commits, 2024/11/01
- 14/222: gnu: Add python-setuptools/python-wheel where necessary., guix-commits, 2024/11/01
- 28/222: gnu: Add python-pytest-mypy-testing., guix-commits, 2024/11/01
- 45/222: gnu: python-mistletoe: Add missing inputs., guix-commits, 2024/11/01
- 07/222: gnu: criu: Remove temporary workaround., guix-commits, 2024/11/01
- 13/222: doc: Document new options for pyproject-build-system., guix-commits, 2024/11/01
- 19/222: gnu: Add setuptools/wheel to more Python packages., guix-commits, 2024/11/01
- 43/222: gnu: python-pytest-arraydiff: Add missing inputs., guix-commits, 2024/11/01
- 46/222: gnu: python-mysqlclient: Add missing inputs., guix-commits, 2024/11/01
- 52/222: gnu: python-pyproject-metadata: Disable two tests., guix-commits, 2024/11/01
- 12/222: guix: pyproject-build-system: Default configure-flags to empty dictionary.,
guix-commits <=
- 17/222: gnu: python-sphinx: Update to 6.2.1., guix-commits, 2024/11/01
- 16/222: gnu: Add missing import (again)., guix-commits, 2024/11/01
- 20/222: gnu: meson-python: Do not delete LICENSES directory., guix-commits, 2024/11/01
- 22/222: gnu: python-mdit-py-plugins: Update to 0.4.0., guix-commits, 2024/11/01
- 32/222: gnu: python-ipython: Update to 8.22.1., guix-commits, 2024/11/01
- 39/222: gnu: java-testng: Drop input labels., guix-commits, 2024/11/01
- 47/222: gnu: python-vine: Add missing inputs., guix-commits, 2024/11/01
- 23/222: gnu: python-rich: Update to 13.7.0., guix-commits, 2024/11/01
- 35/222: gnu: python-packaging-bootstrap: Update to 23.2., guix-commits, 2024/11/01
- 34/222: gnu: python-cleo: Update to 2.1.0., guix-commits, 2024/11/01