[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
89/149: aux-files: sitecustomize: Cleanup and add explanatory comments.
From: |
guix-commits |
Subject: |
89/149: aux-files: sitecustomize: Cleanup and add explanatory comments. |
Date: |
Tue, 26 Oct 2021 23:52:27 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 089f53a9b7989fd34098245ef217ac1a9d3b0c77
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Aug 3 20:41:20 2021 -0400
aux-files: sitecustomize: Cleanup and add explanatory comments.
Fixes <https://issues.guix.gnu.org/50105>.
* gnu/packages/aux-files/python/sitecustomize.py: Add a comment explaining
the
general idea, and use sys.prefix instead of sys.executable.
(major_minor): Use the unpacking operator (*) to provide the arguments.
(site_packages_prefix): Use os.path.join to form the path.
(python_site): Likewise. Use sys.prefix instead of sys.executable.
(all_sites_raw): Split on os.path.pathsep.
(sys.path): Directly splice the result in the list.
Suggested-by: Hartmut Goebel <h.goebel@crazy-compilers.com>
Reported-by: Mathieu Othacehe <othacehe@gnu.org>
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
gnu/packages/aux-files/python/sitecustomize.py | 28 +++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/aux-files/python/sitecustomize.py
b/gnu/packages/aux-files/python/sitecustomize.py
index 65d3c7d..71e328b 100644
--- a/gnu/packages/aux-files/python/sitecustomize.py
+++ b/gnu/packages/aux-files/python/sitecustomize.py
@@ -20,13 +20,26 @@
import os
import sys
-python_root = os.path.realpath(sys.executable).split('/bin/')[0]
-major_minor = '{}.{}'.format(sys.version_info[0], sys.version_info[1])
-site_packages_prefix = 'lib/python' + major_minor + '/site-packages'
-python_site = python_root + '/' + site_packages_prefix
+# Commentary:
+#
+# Site-specific customization for Guix.
+#
+# The program below honors the GUIX_PYTHONPATH environment variable to
+# discover Python packages. File names appearing in this variable that match
+# a predefined versioned installation prefix are added to the sys.path. To be
+# considered, a Python package must be installed under the
+# 'lib/pythonX.Y/site-packages' directory, where X and Y are the major and
+# minor version numbers of the Python interpreter.
+#
+# Code:
+
+major_minor = '{}.{}'.format(*sys.version_info)
+site_packages_prefix = os.path.join(
+ 'lib', 'python' + major_minor, 'site-packages')
+python_site = os.path.join(sys.prefix, site_packages_prefix)
try:
- all_sites_raw = os.environ['GUIX_PYTHONPATH'].split(':')
+ all_sites_raw = os.environ['GUIX_PYTHONPATH'].split(os.path.pathsep)
except KeyError:
all_sites_raw = []
# Normalize paths, otherwise a trailing slash would cause it to not match.
@@ -35,7 +48,8 @@ matching_sites = [p for p in all_sites_norm
if p.endswith(site_packages_prefix)]
# Insert sites matching the current version into sys.path, right before
-# Python's own site.
+# Python's own site. This way, the user can override the libraries provided
+# by Python itself.
sys_path_absolute = [os.path.realpath(p) for p in sys.path]
index = sys_path_absolute.index(python_site)
-sys.path = sys.path[:index] + matching_sites + sys.path[index:]
+sys.path[index:index] = matching_sites
- 62/149: gnu: gst-plugins-good: Update to 1.18.5., (continued)
- 62/149: gnu: gst-plugins-good: Update to 1.18.5., guix-commits, 2021/10/26
- 66/149: gnu: gst-editing-services: Update to 1.18.5., guix-commits, 2021/10/26
- 63/149: gnu: gst-plugins-bad: Update to 1.18.5., guix-commits, 2021/10/26
- 75/149: gnu: glibc: Remove unneeded nscd patching., guix-commits, 2021/10/26
- 72/149: gnu: libnice: Update to 0.1.18-0.47a9633., guix-commits, 2021/10/26
- 68/149: gnu: gstreamer-docs: Update to 1.18.5., guix-commits, 2021/10/26
- 77/149: gnu: tzdata: Update to 2021c., guix-commits, 2021/10/26
- 80/149: gnu: diffutils: Update to 3.8., guix-commits, 2021/10/26
- 85/149: gnu: Add ld-gold-wrapper., guix-commits, 2021/10/26
- 86/149: gnu: gdb: Patch references to /bin/sh and add debug output., guix-commits, 2021/10/26
- 89/149: aux-files: sitecustomize: Cleanup and add explanatory comments.,
guix-commits <=
- 90/149: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/10/26
- 94/149: gnu: fontconfig: Add a search path for XDG_DATA_DIRS., guix-commits, 2021/10/26
- 98/149: gnu: Add python-tomli., guix-commits, 2021/10/26
- 99/149: gnu: python-setuptools-scm: Update to 6.3.2, guix-commits, 2021/10/26
- 102/149: gnu: meson: Patch to allow installing to independent prefixes., guix-commits, 2021/10/26
- 104/149: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/10/26
- 105/149: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., guix-commits, 2021/10/26
- 107/149: gnu: lsof: Disable the LTlock test., guix-commits, 2021/10/26
- 109/149: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/10/26
- 111/149: gnu: colord-minimal: Introduce minimal variant., guix-commits, 2021/10/26