Skip to content

Also add 'bin' subdir to $PATH when installing a Python package #2244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akesandgren merged 1 commit into from
Nov 23, 2020
Merged

Also add 'bin' subdir to $PATH when installing a Python package #2244

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions easybuild/easyblocks/generic/pythonpackage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,10 +609,16 @@ def install_step(self):
for pylibdir in abs_pylibdirs:
mkdir(pylibdir, parents=True)

# set PYTHONPATH as expected
pythonpath = os.getenv('PYTHONPATH')
new_pythonpath = os.pathsep.join([x for x in abs_pylibdirs + [pythonpath] if x is not None])
env.setvar('PYTHONPATH', new_pythonpath, verbose=False)
abs_bindir = os.path.join(self.installdir, 'bin')

# set PYTHONPATH and PATH as expected
old_values = dict()
for name, new_values in (('PYTHONPATH', abs_pylibdirs), ('PATH', [abs_bindir])):
old_value = os.getenv(name)
old_values[name] = old_value
new_value = os.pathsep.join(new_values + ([old_value] if old_value else []))
if new_value:
env.setvar(name, new_value, verbose=False)

# actually install Python package
cmd = self.compose_install_command(self.installdir)
Expand All @@ -623,9 +629,11 @@ def install_step(self):
# (for iterated installations over multiply Python versions)
self.install_cmd_output += out

# restore PYTHONPATH if it was set
if pythonpath is not None:
env.setvar('PYTHONPATH', pythonpath, verbose=False)
# restore env vars if it they were set
for name in ('PYTHONPATH', 'PATH'):
value = old_values[name]
if value is not None:
env.setvar(name, value, verbose=False)

def run(self, *args, **kwargs):
"""Perform the actual Python package build/installation procedure"""
Expand Down