mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-22 02:07:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

sitecustomize.py: Honor .pth files.

Browse source 
Fixes <https://issues.guix.gnu.org/52269>.

* gnu/packages/aux-files/python/sitecustomize.py: Use site.addsitedirs to add
the site directories; this takes care of the .pth files.  Make sure the added
items still appear before Python's own 'site-packages' directory.
This commit is contained in:
Maxim Cournoyer 2021-12-03 22:36:26 -05:00
parent d91de53caa
commit 223cc96e5b
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/aux-files/python/sitecustomize.py
View file

@ -18,6 +18,7 @@
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
import os
import site
import sys
# Commentary:
@ -47,9 +48,18 @@ all_sites_norm = [os.path.normpath(p) for p in all_sites_raw]
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. 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[index:index] = matching_sites
if matching_sites:
# Deduplicate the entries, append them to sys.path, and handle any
# .pth files they contain.
for s in matching_sites:
site.addsitedir(s)
# Move the entries that were appended to sys.path in front of
# Python's own site-packages directory. This enables Guix
# packages to override Python's bundled packages, such as 'pip'.
python_site_index = sys.path.index(python_site)
new_site_start_index = sys.path.index(matching_sites[0])
if python_site_index < new_site_start_index:
sys.path = (sys.path[:python_site_index]
+ sys.path[new_site_start_index:]
+ sys.path[python_site_index:new_site_start_index])