[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/131: build/python: Add the installation bin directory to PATH.
From: |
guix-commits |
Subject: |
04/131: build/python: Add the installation bin directory to PATH. |
Date: |
Fri, 29 Jan 2021 09:21:42 -0500 (EST) |
apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.
commit fa18951745634402395c4a022418503ed5a43052
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Jan 22 11:48:42 2021 -0500
build/python: Add the installation bin directory to PATH.
This also to reduce the need for boilerplate code found in check phase
overrides.
* guix/build/python-build-system.scm (add-install-to-path): New phase.
(%standard-phases): Order it before the check phase.
---
guix/build/python-build-system.scm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/guix/build/python-build-system.scm
b/guix/build/python-build-system.scm
index 9f5fad7..c73f6b0 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -179,6 +179,12 @@ running checks after installing the package."
"A phase that just wraps the 'add-installed-pythonpath' procedure."
(add-installed-pythonpath inputs outputs))
+(define* (add-install-to-path #:key outputs #:allow-other-keys)
+ "Adding Python scripts to PATH is also often useful in tests."
+ (setenv "PATH" (string-append (assoc-ref outputs "out")
+ "/bin:"
+ (getenv "PATH"))))
+
(define* (install #:key inputs outputs (configure-flags '()) use-setuptools?
#:allow-other-keys)
"Install a given Python package."
@@ -296,6 +302,7 @@ by Cython."
(add-after 'install 'check check)
(add-after 'install 'wrap wrap)
(add-before 'check 'add-install-to-pythonpath add-install-to-pythonpath)
+ (add-before 'check 'add-install-to-path add-install-to-path)
(add-before 'strip 'rename-pth-file rename-pth-file)))
(define* (python-build #:key inputs (phases %standard-phases)
- branch cu/farewell-to-pythonpath created (now 96077e5), guix-commits, 2021/01/29
- 01/131: gnu: python: Replace PYTHONPATH by GUIX_PYTHONPATH., guix-commits, 2021/01/29
- 02/131: build/python: Replace PYTHONPATH by GUIX_PYTHONPATH., guix-commits, 2021/01/29
- 03/131: build/python: Always add the install prefix to the Guix PYTHONPATH., guix-commits, 2021/01/29
- 04/131: build/python: Add the installation bin directory to PATH.,
guix-commits <=
- 05/131: build/python: Adjust wrap phase to use the new GUIX_PYTHONPATH., guix-commits, 2021/01/29
- 06/131: build/python: Add a sanity check phase., guix-commits, 2021/01/29
- 08/131: gnu: python-fixtures-bootstrap: Do not sanity check., guix-commits, 2021/01/29
- 10/131: gnu: python-pyfakefs: Disable unreliable test, guix-commits, 2021/01/29
- 09/131: gnu: python-pytest-pep8: Fix package., guix-commits, 2021/01/29
- 11/131: gnu: python-slugify: Add missing input., guix-commits, 2021/01/29
- 12/131: gnu: python-websockets: Fix Python package name., guix-commits, 2021/01/29
- 14/131: gnu: python-traitlets: Add missing input., guix-commits, 2021/01/29
- 15/131: gnu: python-idna-ssl: Add missing input., guix-commits, 2021/01/29
- 17/131: gnu: python-automat: Remove broken console script., guix-commits, 2021/01/29