Skip to content

Commit

Permalink
Merge pull request #3546 from branfosj/20250102113646_new_pr_python
Browse files Browse the repository at this point in the history
switch default to `install_pip=True` in `python.py`
  • Loading branch information
Micket authored Jan 2, 2025
2 parents 4e7c190 + bfe295f commit 30dba35
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion easybuild/easyblocks/p/python.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def extra_options():
"""Add extra config options specific to Python."""
extra_vars = {
'ebpythonprefixes': [True, "Create sitecustomize.py and allow use of $EBPYTHONPREFIXES", CUSTOM],
'install_pip': [False,
'install_pip': [True,
"Use the ensurepip module (Python 2.7.9+, 3.4+) to install the bundled versions "
"of pip and setuptools into Python. You _must_ then use pip for upgrading "
"pip & setuptools by installing newer versions as extensions!",
Expand Down
3 changes: 3 additions & 0 deletions test/easyblocks/init_easyblocks.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@ def innertest(self):
elif easyblock_fn == 'paraver.py':
# custom easyblock for Paraver requires version >= 4.7
innertest = make_inner_test(easyblock, version='4.8')
elif easyblock_fn in ['python.py', 'tkinter.py']:
# custom easyblock for Python (ensurepip) requires version >= 3.4.0
innertest = make_inner_test(easyblock, version='3.4.0')
elif easyblock_fn == 'torchvision.py':
# torchvision easyblock requires that PyTorch is listed as dependency
innertest = make_inner_test(easyblock, name='torchvision', deps=[('PyTorch', '1.12.1')])
Expand Down
3 changes: 3 additions & 0 deletions test/easyblocks/module.py
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,9 @@ def innertest(self):
elif eb_fn == 'paraver.py':
# custom easyblock for Paraver requires version >= 4.7
innertest = make_inner_test(easyblock, name='Paraver', version='4.8')
elif eb_fn in ['python.py', 'tkinter.py']:
# custom easyblock for Python (ensurepip) requires version >= 3.4.0
innertest = make_inner_test(easyblock, name=eb_fn.replace('_', '-')[:-3], version='3.4.0')
elif eb_fn == 'torchvision.py':
# torchvision easyblock requires that PyTorch is listed as dependency
extra_txt = "dependencies = [('PyTorch', '1.12.1')]"
Expand Down

0 comments on commit 30dba35

Please sign in to comment.