zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow bootstrapping to work when partial or incompatible modules exist in the module path (#31035)

Browse Source
This commit is contained in:
Tom Scogland 2022-06-15 12:09:07 -05:00 committed by GitHub
parent 8c58c14c3d
commit b261b2a5ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/spack/spack/bootstrap.py
View File

@ -80,12 +80,21 @@ def _try_import_from_store(module, query_spec, query_info=None):
for candidate_spec in installed_specs: for candidate_spec in installed_specs:
pkg = candidate_spec['python'].package pkg = candidate_spec['python'].package
module_paths = { module_paths = [
os.path.join(candidate_spec.prefix, pkg.purelib), os.path.join(candidate_spec.prefix, pkg.purelib),
os.path.join(candidate_spec.prefix, pkg.platlib), os.path.join(candidate_spec.prefix, pkg.platlib),
} ] # type: list[str]
sys.path.extend(module_paths) path_before = list(sys.path)
# NOTE: try module_paths first and last, last allows an existing version in path
# to be picked up and used, possibly depending on something in the store, first
# allows the bootstrap version to work when an incompatible version is in
# sys.path
orders = [
module_paths + sys.path,
sys.path + module_paths,
]
for path in orders:
sys.path = path
try: try:
_fix_ext_suffix(candidate_spec) _fix_ext_suffix(candidate_spec)
if _python_import(module): if _python_import(module):
@ -105,7 +114,7 @@ def _try_import_from_store(module, query_spec, query_info=None):
msg = "Spec {0} did not provide module {1}" msg = "Spec {0} did not provide module {1}"
tty.warn(msg.format(candidate_spec, module)) tty.warn(msg.format(candidate_spec, module))
sys.path = sys.path[:-3] sys.path = path_before
return False return False