[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/57: guix: build all Python packages with --single-version-externally-
From: |
Hartmut Goebel |
Subject: |
02/57: guix: build all Python packages with --single-version-externally-managed. |
Date: |
Thu, 13 Oct 2016 15:20:31 +0000 (UTC) |
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 2c37e36ac6c06c49f73feb7cf03c82958704272a
Author: Hartmut Goebel <address@hidden>
Date: Wed Sep 28 10:42:35 2016 +0200
guix: build all Python packages with --single-version-externally-managed.
This requires setuptools to be installed together with python, which is
the case for Python 3 anyway and which we do for our build of Python 2
(see last commit).
* guix/build/python-build-system.scm (install): Add
"--single-version-externally-managed" and "--root=/" to params to be
passed to call-setuppy. Remove thus needless manipulation of
PYTHONPATH.
---
guix/build/python-build-system.scm | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/guix/build/python-build-system.scm
b/guix/build/python-build-system.scm
index 9109fb4..d07b83f 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2013 Andreas Enge <address@hidden>
;;; Copyright © 2013 Nikita Karetnikov <address@hidden>
;;; Copyright © 2015 Mark H Weaver <address@hidden>
+;;; Copyright © 2016 Hartmut Goebel <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -64,21 +65,11 @@
#:allow-other-keys)
"Install a given Python package."
(let* ((out (assoc-ref outputs "out"))
- (params (append (list (string-append "--prefix=" out))
- configure-flags))
- (python-version (get-python-version (assoc-ref inputs "python")))
- (old-path (getenv "PYTHONPATH"))
- (add-path (string-append out "/lib/python" python-version
- "/site-packages/")))
- ;; create the module installation directory and add it to PYTHONPATH
- ;; to make setuptools happy
- (mkdir-p add-path)
- (setenv "PYTHONPATH"
- (string-append (if old-path
- (string-append old-path ":")
- "")
- add-path))
- (call-setuppy "install" params)))
+ (params (append (list (string-append "--prefix=" out)
+ "--single-version-externally-managed"
+ "--root=/")
+ configure-flags)))
+ (call-setuppy "install" params)))
(define* (wrap #:key inputs outputs #:allow-other-keys)
(define (list-of-files dir)
- 41/57: gnu: python2-pysnptools: Correct inputs., (continued)
- 41/57: gnu: python2-pysnptools: Correct inputs., Hartmut Goebel, 2016/10/13
- 57/57: Add a series of FIXME and TODO comments., Hartmut Goebel, 2016/10/13
- 55/57: gnu: python-testscenarios: remove needless input "mimetools"., Hartmut Goebel, 2016/10/13
- 11/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 2), Hartmut Goebel, 2016/10/13
- 01/57: gnu: ensure pip and setuptools are installed even for Python 2., Hartmut Goebel, 2016/10/13
- 15/57: gnu: Remove needless inputs python-pip and python2-pip., Hartmut Goebel, 2016/10/13
- 30/57: gnu: python-h5py: Remove needless "python2-variant" property., Hartmut Goebel, 2016/10/13
- 34/57: gnu: python-testrepositoryfixture: Correct inputs., Hartmut Goebel, 2016/10/13
- 07/57: guix: Add lint-checker for packages which should be no inputs at all., Hartmut Goebel, 2016/10/13
- 21/57: gnu: Fix inputs in python.scm, part 2: inputs -> native-inputs., Hartmut Goebel, 2016/10/13
- 02/57: guix: build all Python packages with --single-version-externally-managed.,
Hartmut Goebel <=
- 33/57: gnu: python-fixture: Enable tests., Hartmut Goebel, 2016/10/13
- 32/57: gnu: python-fixture: Correct inputs., Hartmut Goebel, 2016/10/13
- 36/57: gnu: python-singledispatch: correct inputs., Hartmut Goebel, 2016/10/13
- 39/57: gnu: python-zope-schema: Add missing inputs., Hartmut Goebel, 2016/10/13
- 29/57: gnu: python-ccm: Update synopsis and description., Hartmut Goebel, 2016/10/13
- 38/57: gnu: python-pytest-flakes: Fix build., Hartmut Goebel, 2016/10/13
- 28/57: gnu: python-ccm: Add missing input python-psutil., Hartmut Goebel, 2016/10/13
- 51/57: gnu: python-scripttest: Correct inputs., Hartmut Goebel, 2016/10/13
- 16/57: gnu: Remove work-arounds for bug 20765 (ensure uncompressed eggs)., Hartmut Goebel, 2016/10/13
- 56/57: gnu: pytest-mock: remove needless propagated input "python-py"., Hartmut Goebel, 2016/10/13