[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/40: guix: pyproject-build-system: Default configure-flags to empty di
From: |
guix-commits |
Subject: |
12/40: guix: pyproject-build-system: Default configure-flags to empty dictionary. |
Date: |
Wed, 3 Apr 2024 16:04:24 -0400 (EDT) |
rekado pushed a commit to branch python-team
in repository guix.
commit 318351c992aed350f1576a1c74144b6a3f9abb23
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 74e28f0e98..eaf871f2cf 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)
- 14/40: gnu: Add python-setuptools/python-wheel where necessary., (continued)
- 14/40: gnu: Add python-setuptools/python-wheel where necessary., guix-commits, 2024/04/03
- 31/40: gnu: python-prompt-toolkit: Update to 3.0.43., guix-commits, 2024/04/03
- 30/40: gnu: python-traitlets: Update to 5.14.1., guix-commits, 2024/04/03
- 15/40: gnu: Add missing import., guix-commits, 2024/04/03
- 24/40: gnu: python-jupytext: Update to 1.15.0., guix-commits, 2024/04/03
- 25/40: gnu: python-textual: Update to 0.50.1., guix-commits, 2024/04/03
- 28/40: gnu: Add python-pytest-mypy-testing., guix-commits, 2024/04/03
- 39/40: gnu: java-testng: Drop input labels., guix-commits, 2024/04/03
- 08/40: gnu: sssd: Import ensure-no-mtimes-pre-1980., guix-commits, 2024/04/03
- 05/40: build-system/pyproject: Use python-sans-pip-wrapper as default-python., guix-commits, 2024/04/03
- 12/40: guix: pyproject-build-system: Default configure-flags to empty dictionary.,
guix-commits <=
- 22/40: gnu: python-mdit-py-plugins: Update to 0.4.0., guix-commits, 2024/04/03
- 34/40: gnu: python-cleo: Update to 2.1.0., guix-commits, 2024/04/03
- 35/40: gnu: python-packaging-bootstrap: Update to 23.2., guix-commits, 2024/04/03
- 06/40: build-system/python: Ignore symlinks when changing mtime., guix-commits, 2024/04/03
- 19/40: gnu: Add setuptools/wheel to more Python packages., guix-commits, 2024/04/03
- 23/40: gnu: python-rich: Update to 13.7.0., guix-commits, 2024/04/03
- 16/40: gnu: Add missing import (again)., guix-commits, 2024/04/03
- 27/40: gnu: python-lightning-cloud: Disable tests., guix-commits, 2024/04/03
- 11/40: gnu: python-pytest-xdist: Disable failing test., guix-commits, 2024/04/03
- 09/40: guix: toml: Add TOML parser., guix-commits, 2024/04/03