[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/97: gnu: python-2.7: Add all guix prefixes in PYTHONPATH to site-pref
From: |
Hartmut Goebel |
Subject: |
08/97: gnu: python-2.7: Add all guix prefixes in PYTHONPATH to site-prefixes. |
Date: |
Tue, 18 Oct 2016 20:13:15 +0000 (UTC) |
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 5ef9e8f0c936ddd892ed902d4e7dac4a36b56252
Author: Hartmut Goebel <address@hidden>
Date: Tue Oct 18 00:11:05 2016 +0200
gnu: python-2.7: Add all guix prefixes in PYTHONPATH to site-prefixes.
* gnu/packages/patches/python-2.7-site-prefixes.patch: New file.
* gnu/packages/python.scm (python-2)[source]: Use it.
* gnu/local.mk (dist_patch_DATA): Add patch.
---
gnu/local.mk | 1 +
.../patches/python-2.7-site-prefixes.patch | 26 ++++++++++++++++++++
gnu/packages/python.scm | 1 +
3 files changed, 28 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 5226b49..b714405 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -780,6 +780,7 @@ dist_patch_DATA =
\
%D%/packages/patches/pyqt-configure.patch \
%D%/packages/patches/python-2-deterministic-build-info.patch \
%D%/packages/patches/python-2.7-search-paths.patch \
+ %D%/packages/patches/python-2.7-site-prefixes.patch \
%D%/packages/patches/python-2.7-source-date-epoch.patch \
%D%/packages/patches/python-3-deterministic-build-info.patch \
%D%/packages/patches/python-3-search-paths.patch \
diff --git a/gnu/packages/patches/python-2.7-site-prefixes.patch
b/gnu/packages/patches/python-2.7-site-prefixes.patch
new file mode 100644
index 0000000..9e30665
--- /dev/null
+++ b/gnu/packages/patches/python-2.7-site-prefixes.patch
@@ -0,0 +1,26 @@
+Add all /gnu/store/ prefixes found in PYTHONPATH to the prefixes where
+site-packages (and .pth files) are searched.
+
+*** Python-2.7.11/Lib/site.py.orig 2016-10-17 23:27:23.746149690 +0200
+--- Python-2.7.11/Lib/site.py 2016-10-17 23:44:51.930871644 +0200
+***************
+*** 65,70 ****
+--- 65,82 ----
+
+ # Prefixes for site-packages; add additional prefixes like /usr/local here
+ PREFIXES = [sys.prefix, sys.exec_prefix]
++ # Guix: Add all /gnu/store-paths in PYTHONPATH--these are all
++ # "prefixes". This is required to search .pth files in all python
++ # packages contained in /gnu/store which is required to make
++ # .pth-defined namespace packages work.
++ # This is necessary if the packages are not merged into a single
++ # `site-packages` directory (like when using `guix environment`) but
++ # listed in PYTHONPATH (like when running `guix build`).
++ for p in sys.path:
++ if p.startswith('/gnu/store/'):
++ PREFIXES.append(p[:p.find('/', 44)]) # find first pathsep after hash
++ del p
++
+ # Enable per user site-packages directory
+ # set it to False to disable the feature or True to force the feature
+ ENABLE_USER_SITE = None
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 12a4534..c50fb7f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -117,6 +117,7 @@
"0iiz844riiznsyhhyy962710pz228gmhv8qi3yk4w4jhmx2lqawn"))
(patches (search-patches "python-2.7-search-paths.patch"
"python-2-deterministic-build-info.patch"
+ "python-2.7-site-prefixes.patch"
"python-2.7-source-date-epoch.patch"))
(modules '((guix build utils)))
;; suboptimal to delete failing tests here, but if we delete them in the
- 01/97: guix: python-build-system: Fix an outdated comment., (continued)
- 01/97: guix: python-build-system: Fix an outdated comment., Hartmut Goebel, 2016/10/18
- 07/97: guix: python-build-system: Delete .egg-info file created in phase check., Hartmut Goebel, 2016/10/18
- 04/97: guix: python-build-system: Import setuptools before calling `setup.py'., Hartmut Goebel, 2016/10/18
- 02/97: gnu: ensure pip and setuptools are installed even for Python 2., Hartmut Goebel, 2016/10/18
- 05/97: guix: python-build-system: Add option "#:use-setuptools?" (default true)., Hartmut Goebel, 2016/10/18
- 06/97: guix: python-build-system: Add helpers for getting and setting PYTHONPATH., Hartmut Goebel, 2016/10/18
- 10/97: lint: more packages to probably be a native input., Hartmut Goebel, 2016/10/18
- 17/97: gnu: Remove needless inputs python-pip and python2-pip., Hartmut Goebel, 2016/10/18
- 20/97: gnu: python-pytest: Propagate input "python-py"., Hartmut Goebel, 2016/10/18
- 19/97: gnu: scons: Do not use setuptools for building., Hartmut Goebel, 2016/10/18
- 08/97: gnu: python-2.7: Add all guix prefixes in PYTHONPATH to site-prefixes.,
Hartmut Goebel <=
- 09/97: guix: Add lint-checker for packages which should be no inputs at all., Hartmut Goebel, 2016/10/18
- 21/97: gnu: python-pytest-cov: Use upstream options for testing., Hartmut Goebel, 2016/10/18
- 25/97: inputs -> propagated-inputs: special, Hartmut Goebel, 2016/10/18
- 14/97: gnu: Remove python-setuptools and python2-setuptools from inputs (part 3), Hartmut Goebel, 2016/10/18
- 26/97: gnu: python-sphinx-rtd-theme: Remove inputs., Hartmut Goebel, 2016/10/18
- 32/97: gnu: python-h5py: Remove needless "python2-variant" property., Hartmut Goebel, 2016/10/18
- 24/97: gnu: Fix inputs in python.scm, part 2: native-inputs -> propagated-inputs., Hartmut Goebel, 2016/10/18
- 18/97: gnu: Remove work-arounds for bug 20765 (ensure uncompressed eggs)., Hartmut Goebel, 2016/10/18
- 34/97: gnu: python-fixture: Correct inputs., Hartmut Goebel, 2016/10/18
- 23/97: gnu: Fix inputs in python.scm, part 2: inputs -> native-inputs., Hartmut Goebel, 2016/10/18