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

Jump to bottom

don't add bin subdir to $PATH via modextrapaths in ReFrame easyconfigs #14415

Merged
merged 4 commits into from
Dec 9, 2021
Merged

don't add bin subdir to $PATH via modextrapaths in ReFrame easyconfigs #14415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36fdcd2
no longer necessary to add bin to PATH
bedroge Nov 24, 2021
7791e29
Merge branch 'develop' of github.com:easybuilders/easybuild-easyconfi…
bedroge Nov 24, 2021
8781655
no longer necessary to add bin to PATH
bedroge Nov 24, 2021
42e2ab8
add bin subdir to $PATH in preinstallopts in ReFrame easyconfigs to e…
boegel Dec 9, 2021
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
8 changes: 5 additions & 3 deletions easybuild/easyconfigs/r/ReFrame/ReFrame-3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ req_py_minver = 6

use_pip = True

exts_default_options = {
# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages
'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && ",
}

exts_list = [
('pip', '20.1.1', {
'checksums': ['27f8dc29387dd83249e06e681ce087e6061826582198a425085e0bf4c1cf3a55'],
Expand Down Expand Up @@ -69,7 +74,4 @@ sanity_check_commands = ['reframe -V']

sanity_pip_check = True

# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions
modextrapaths = {'PATH': 'bin'}
boegel marked this conversation as resolved.
Show resolved Hide resolved

moduleclass = 'devel'
8 changes: 5 additions & 3 deletions easybuild/easyconfigs/r/ReFrame/ReFrame-3.2.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ req_py_minver = 6

use_pip = True

exts_default_options = {
# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages
'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && ",
}

exts_list = [
('pip', '20.2.4', {
'checksums': ['85c99a857ea0fb0aedf23833d9be5c40cf253fe24443f0829c7b472e23c364a1'],
Expand Down Expand Up @@ -73,7 +78,4 @@ sanity_check_commands = ['reframe -V']

sanity_pip_check = True

# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions
modextrapaths = {'PATH': 'bin'}

moduleclass = 'devel'
8 changes: 4 additions & 4 deletions easybuild/easyconfigs/r/ReFrame/ReFrame-3.3.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ exts_list = [

# Use bootstrap script to install ReFrame dependencies under `external`.
# ReFrame adds `external` to its own python path before executing, without
# affecting the python path of the system
'preinstallopts': './bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && ',
# affecting the python path of the system;
# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages
'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && "
"./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && ",
}),
]

Expand All @@ -55,9 +57,7 @@ sanity_check_commands = ['reframe -V']

sanity_pip_check = True

# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions
modextrapaths = {
'PATH': 'bin',
# bootstrap script installs required dependencies to 'external' subdirectory
'PYTHONPATH': 'external',
}
Expand Down
6 changes: 3 additions & 3 deletions easybuild/easyconfigs/r/ReFrame/ReFrame-3.4.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ exts_list = [
'checksums': ['1b18ef17d74ba97ac9c0e4b4265f123f07a8ae85d9cd093949fa056d3eeeead5'],
}),
('reframe', version, {
'preinstallopts': "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && ",
# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages
'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && "
"./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && ",
'source_tmpl': 'v%(version)s.tar.gz',
'source_urls': ['https://github.com/eth-cscs/reframe/archive/'],
'checksums': ['aed5752a2f687002839923c5432784d3a25d3a29d43b69122dcbf72befa0fdbf'],
Expand All @@ -49,9 +51,7 @@ sanity_check_commands = ['reframe -V']

sanity_pip_check = True

# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions
modextrapaths = {
'PATH': 'bin',
# bootstrap script installs required dependencies to 'external' subdirectory
'PYTHONPATH': 'external',
}
Expand Down
6 changes: 3 additions & 3 deletions easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ exts_list = [
'checksums': ['1b18ef17d74ba97ac9c0e4b4265f123f07a8ae85d9cd093949fa056d3eeeead5'],
}),
('reframe', version, {
'preinstallopts': "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && ",
# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages
'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && "
"./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && ",
'source_tmpl': 'v%(version)s.tar.gz',
'source_urls': ['https://github.com/eth-cscs/reframe/archive/'],
'checksums': ['81b501be4252c99f12043cb21b0b7b8059207a340fc94173b180444599773f1a'],
Expand Down Expand Up @@ -53,9 +55,7 @@ sanity_check_commands = ['reframe -V']

sanity_pip_check = True

# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions
modextrapaths = {
'PATH': 'bin',
# bootstrap script installs required dependencies to 'external' subdirectory
'PYTHONPATH': 'external',
}
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ use_pip = True

# bump hardcoded importlib-metadata version to more recent version, only require it with Python < 3.8
local_preinstallopts = r"""sed -i "s/\(importlib.*\)==.*/\1==3.10.0; python_version < '3.8'/g" requirements.txt && """
# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages
local_preinstallopts += "export PATH=%(installdir)s/bin:$PATH && "
# use bootstrap script to install required Python packages
local_preinstallopts += "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && "

Expand Down Expand Up @@ -62,9 +64,7 @@ sanity_check_commands = ['reframe -V']

sanity_pip_check = True

# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions
modextrapaths = {
'PATH': 'bin',
# bootstrap script installs required dependencies to 'external' subdirectory
'PYTHONPATH': 'external',
}
Expand Down
6 changes: 3 additions & 3 deletions easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.2.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ exts_list = [
'checksums': ['1b18ef17d74ba97ac9c0e4b4265f123f07a8ae85d9cd093949fa056d3eeeead5'],
}),
('reframe', version, {
'preinstallopts': "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && ",
# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages
'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && "
"./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && ",
'source_tmpl': 'v%(version)s.tar.gz',
'source_urls': ['https://github.com/eth-cscs/reframe/archive/'],
'checksums': ['50d461811f6bba7c9b897866a290063e1bd229e7055f5acc2de1f749b99bfce7']
Expand Down Expand Up @@ -53,9 +55,7 @@ sanity_check_commands = ['reframe -V']

sanity_pip_check = True

# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions
modextrapaths = {
'PATH': 'bin',
# bootstrap script installs required dependencies to 'external' subdirectory
'PYTHONPATH': 'external',
}
Expand Down
8 changes: 4 additions & 4 deletions easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.2.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ exts_list = [
'checksums': ['1b18ef17d74ba97ac9c0e4b4265f123f07a8ae85d9cd093949fa056d3eeeead5'],
}),
('reframe', version, {
'prebuildopts': ('./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && '
'PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH '),
# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages
'prebuildopts': "export PATH=%(installdir)s/bin:$PATH && "
"./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && "
"PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH ",
'source_tmpl': 'v%(version)s.tar.gz',
'source_urls': ['https://github.com/eth-cscs/reframe/archive/'],
'use_pip': False,
Expand Down Expand Up @@ -55,9 +57,7 @@ sanity_check_commands = ['reframe -V']

sanity_pip_check = True

# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions
modextrapaths = {
'PATH': 'bin',
# bootstrap script installs required dependencies to 'external' subdirectory
'PYTHONPATH': 'external',
}
Expand Down
6 changes: 3 additions & 3 deletions easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.3.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ exts_list = [
'checksums': ['1b18ef17d74ba97ac9c0e4b4265f123f07a8ae85d9cd093949fa056d3eeeead5'],
}),
('reframe', version, {
'prebuildopts': "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && "
# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages
'prebuildopts': "export PATH=%(installdir)s/bin:$PATH && "
"./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && "
"PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH ",
'source_tmpl': 'v%(version)s.tar.gz',
'source_urls': ['https://github.com/eth-cscs/reframe/archive/'],
Expand Down Expand Up @@ -55,9 +57,7 @@ sanity_check_commands = ['reframe -V']

sanity_pip_check = True

# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions
modextrapaths = {
'PATH': 'bin',
# bootstrap script installs required dependencies to 'external' subdirectory
'PYTHONPATH': 'external',
}
Expand Down
6 changes: 3 additions & 3 deletions easybuild/easyconfigs/r/ReFrame/ReFrame-3.7.3.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ exts_list = [
'checksums': ['6bac238ffdf24e8806c61440e755192470352850f3419a52f26ffe0a1a64f465'],
}),
('reframe', version, {
'preinstallopts': "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && "
# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages
'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && "
"./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && "
"PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH ",
'source_tmpl': 'v%(version)s.tar.gz',
'source_urls': ['https://github.com/eth-cscs/reframe/archive/'],
Expand All @@ -54,9 +56,7 @@ sanity_check_commands = ['reframe -V']

sanity_pip_check = True

# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions
modextrapaths = {
'PATH': 'bin',
# bootstrap script installs required dependencies to 'external' subdirectory
'PYTHONPATH': 'external',
}
Expand Down
6 changes: 3 additions & 3 deletions easybuild/easyconfigs/r/ReFrame/ReFrame-3.8.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ exts_list = [
'checksums': ['6bac238ffdf24e8806c61440e755192470352850f3419a52f26ffe0a1a64f465'],
}),
('reframe', version, {
'preinstallopts': "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && "
# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages
'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && "
"./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && "
"PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH ",
'source_tmpl': 'v%(version)s.tar.gz',
'source_urls': ['https://github.com/eth-cscs/reframe/archive/'],
Expand All @@ -53,9 +55,7 @@ sanity_check_commands = ['reframe -V']

sanity_pip_check = True

# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions
modextrapaths = {
'PATH': 'bin',
# bootstrap script installs required dependencies to 'external' subdirectory
'PYTHONPATH': 'external',
}
Expand Down
6 changes: 3 additions & 3 deletions easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ exts_list = [
'checksums': ['6bac238ffdf24e8806c61440e755192470352850f3419a52f26ffe0a1a64f465'],
}),
('reframe', version, {
'preinstallopts': "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && "
# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages
'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && "
"./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && "
"PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH ",
'source_tmpl': 'v%(version)s.tar.gz',
'source_urls': ['https://github.com/eth-cscs/reframe/archive/'],
Expand All @@ -54,9 +56,7 @@ sanity_check_commands = ['reframe -V']

sanity_pip_check = True

# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions
modextrapaths = {
'PATH': 'bin',
# bootstrap script installs required dependencies to 'external' subdirectory
'PYTHONPATH': 'external',
}
Expand Down
6 changes: 3 additions & 3 deletions easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ exts_list = [
'checksums': ['6bac238ffdf24e8806c61440e755192470352850f3419a52f26ffe0a1a64f465'],
}),
('reframe', version, {
'preinstallopts': "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && "
# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages
'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && "
"./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && "
"PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH ",
'source_tmpl': 'v%(version)s.tar.gz',
'source_urls': ['https://github.com/eth-cscs/reframe/archive/'],
Expand All @@ -54,9 +56,7 @@ sanity_check_commands = ['reframe -V']

sanity_pip_check = True

# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions
modextrapaths = {
'PATH': 'bin',
# bootstrap script installs required dependencies to 'external' subdirectory
'PYTHONPATH': 'external',
}
Expand Down