Skip to content
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

enhance Python easyblock to explicitly disable installing core-pip when install_pip is not True #2476

Merged
merged 1 commit into from
Jun 21, 2021
Merged

enhance Python easyblock to explicitly disable installing core-pip when install_pip is not True #2476

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
7 changes: 4 additions & 3 deletions easybuild/easyblocks/p/python.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,9 +325,10 @@ def configure_step(self):
if LooseVersion(gcc_ver) >= LooseVersion('8.0'):
self.cfg.update('configopts', "--enable-optimizations")

if self.install_pip:
# Default in 3.4+, required in 2.7
self.cfg.update('configopts', "--with-ensurepip=upgrade")
# When ensurepip is available we explicitely set this.
# E.g. in 3.4 it is by default "upgrade", i.e. on which is unexpected when we did set it to off
if self._has_ensure_pip():
self.cfg.update('configopts', "--with-ensurepip=" + ('no', 'upgrade')[self.install_pip])

modules_setup = os.path.join(self.cfg['start_dir'], 'Modules', 'Setup')
if LooseVersion(self.version) < LooseVersion('3.8.0'):
Expand Down