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

switch default to install_pip=True in custom Python easyblock #3546

Merged
merged 5 commits into from
Jan 2, 2025
Merged

switch default to install_pip=True in custom Python easyblock #3546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c93116
switch default to `install_pip=True` in `python.py`
branfosj Jan 2, 2025
0f03eb2
tests
branfosj Jan 2, 2025
ec12103
eb_fn
branfosj Jan 2, 2025
c0ba76b
and tkinter
branfosj Jan 2, 2025
bfe295f
copy/paste fail
branfosj Jan 2, 2025
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
2 changes: 1 addition & 1 deletion easybuild/easyblocks/p/python.py
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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