[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: |
Sat, 15 Oct 2016 14:08:10 +0000 (UTC) |
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 076ffbe1b04838b0444fed7b5120b5e1bc4d00a2
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)
- branch wip-python-build-system created (now f73de82), Hartmut Goebel, 2016/10/15
- 01/57: gnu: ensure pip and setuptools are installed even for Python 2., Hartmut Goebel, 2016/10/15
- 02/57: guix: build all Python packages with --single-version-externally-managed.,
Hartmut Goebel <=
- 03/57: guix: python-build-system: Import setuptools before calling `setup.py'., Hartmut Goebel, 2016/10/15
- 15/57: gnu: Remove needless inputs python-pip and python2-pip., Hartmut Goebel, 2016/10/15
- 05/57: guix: python-build-system: Add helpers for getting and setting PYTHONPATH., Hartmut Goebel, 2016/10/15
- 04/57: guix: python-build-system: Add option "#:use-setuptools?" (default true)., Hartmut Goebel, 2016/10/15
- 12/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 3), Hartmut Goebel, 2016/10/15
- 18/57: gnu: python-pytest: Propagate input "python-py"., Hartmut Goebel, 2016/10/15
- 17/57: gnu: scons: Do not use setuptools for building., Hartmut Goebel, 2016/10/15
- 07/57: guix: Add lint-checker for packages which should be no inputs at all., Hartmut Goebel, 2016/10/15
- 08/57: lint: more packages to probably be a native input., Hartmut Goebel, 2016/10/15
- 19/57: gnu: python-pytest-cov: Use upstream options for testing., Hartmut Goebel, 2016/10/15