[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/30: guix: pyproject-build-system: Default configure-flags to empty di
From: |
guix-commits |
Subject: |
07/30: guix: pyproject-build-system: Default configure-flags to empty dictionary. |
Date: |
Sun, 30 Jun 2024 03:40:30 -0400 (EDT) |
lbraun pushed a commit to branch pyproject-build-system
in repository guix.
commit e1720e15b2f683a64d3060656fc9a93c600e6b63
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 c0cba8076f..346c80aab8 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)
- branch pyproject-build-system created (now 509802b475), guix-commits, 2024/06/30
- 01/30: build-system/pyproject: Use python-sans-pip-wrapper as default-python., guix-commits, 2024/06/30
- 05/30: guix: toml: Add TOML parser., guix-commits, 2024/06/30
- 06/30: build-system/pyproject: Use TOML parser., guix-commits, 2024/06/30
- 02/30: build-system/python: Ignore symlinks when changing mtime., guix-commits, 2024/06/30
- 08/30: doc: Document new options for pyproject-build-system., guix-commits, 2024/06/30
- 03/30: gnu: criu: Remove temporary workaround., guix-commits, 2024/06/30
- 04/30: gnu: sssd: Import ensure-no-mtimes-pre-1980., guix-commits, 2024/06/30
- 07/30: guix: pyproject-build-system: Default configure-flags to empty dictionary.,
guix-commits <=
- 13/30: gnu: python-pynacl: Add missing inputs., guix-commits, 2024/06/30
- 15/30: gnu: python-mistletoe: Add missing inputs., guix-commits, 2024/06/30
- 16/30: gnu: python-mysqlclient: Add missing inputs., guix-commits, 2024/06/30
- 17/30: gnu: python-vine: Add missing inputs., guix-commits, 2024/06/30
- 22/30: gnu: python-partd: Add missing input., guix-commits, 2024/06/30
- 23/30: gnu: python-dbus-python: Add missing input., guix-commits, 2024/06/30
- 25/30: guix: toml: Fix parsing empty strings in arrays., guix-commits, 2024/06/30
- 26/30: gnu: snakemake-6: Add Setuptools and Wheel., guix-commits, 2024/06/30
- 29/30: gnu: python-openpyxl: Add Setuptools and Wheel., guix-commits, 2024/06/30
- 09/30: gnu: Add python-setuptools/python-wheel where necessary., guix-commits, 2024/06/30