Skip to content

Commit

Permalink
python: rework how we compute the "command" property (spack#46850)
Browse files Browse the repository at this point in the history
Some Windows Python installations may store the Python exe in Scripts/
rather than the base directory. Update `.command` to search in both
locations on Windows. On all systems, the search is now done
recursively from the search root: on Windows, that is the base install
directory, and on other systems it is bin/.
  • Loading branch information
alalazo authored Oct 9, 2024
1 parent 6d67992 commit 8e4e3c9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
1 change: 1 addition & 0 deletions lib/spack/llnl/util/filesystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"copy_mode",
"filter_file",
"find",
"find_first",
"find_headers",
"find_all_headers",
"find_libraries",
Expand Down
21 changes: 11 additions & 10 deletions var/spack/repos/builtin/packages/python/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -858,14 +858,14 @@ def command(self):
# * python
#
# in that order if using [email protected], for example.
version = self.spec.version
for ver in [version.up_to(2), version.up_to(1), ""]:
if sys.platform != "win32":
path = os.path.join(self.prefix.bin, "python{0}".format(ver))
else:
path = os.path.join(self.prefix, "python{0}.exe".format(ver))
if os.path.exists(path):
return Executable(path)
suffixes = [self.spec.version.up_to(2), self.spec.version.up_to(1), ""]
file_extension = "" if sys.platform != "win32" else ".exe"
patterns = [f"python{ver}{file_extension}" for ver in suffixes]
root = self.prefix.bin if sys.platform != "win32" else self.prefix
path = find_first(root, files=patterns)

if path is not None:
return Executable(path)

else:
# Give a last try at rhel8 platform python
Expand All @@ -874,8 +874,9 @@ def command(self):
if os.path.exists(path):
return Executable(path)

msg = "Unable to locate {0} command in {1}"
raise RuntimeError(msg.format(self.name, self.prefix.bin))
raise RuntimeError(
f"cannot to locate the '{self.name}' command in {root} or its subdirectories"
)

@property
def config_vars(self):
Expand Down

0 comments on commit 8e4e3c9

Please sign in to comment.