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

consistently use system toolchain in EasyBuild easyconfigs #15126

Merged
merged 2 commits into from
Mar 14, 2022
Merged

consistently use system toolchain in EasyBuild easyconfigs #15126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98e0d74
consistently use system toolchain in EasyBuild easyconfigs
boegel Mar 13, 2022
ff80fa2
remove exception for using dummy toolchain in EasyBuild easyconfigs
boegel Mar 13, 2022
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/easyconfigs/e/EasyBuild/EasyBuild-3.9.4.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# vsc-install
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.0.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.0.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.1.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.1.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.1.2.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.2.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.2.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.2.2.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.3.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.3.2.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.3.3.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.3.4.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.4.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.4.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.4.2.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.5.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.5.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.5.2.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.5.3.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""

toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = SYSTEM

source_urls = [
# easybuild-framework
Expand Down
6 changes: 2 additions & 4 deletions test/easyconfigs/easyconfigs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,11 +1214,9 @@ def template_easyconfig_test(self, spec):
self.assertTrue(ec['version'], app.version)

# make sure that deprecated 'dummy' toolchain is no longer used, should use 'system' toolchain instead
# but give recent EasyBuild easyconfigs special treatment to avoid breaking "eb --install-latest-eb-release"
ec_fn = os.path.basename(spec)
if not (ec_fn == 'EasyBuild-3.9.4.eb' or ec_fn.startswith('EasyBuild-4.')):
error_msg_tmpl = "%s should use 'system' toolchain rather than deprecated 'dummy' toolchain"
self.assertFalse(ec['toolchain']['name'] == 'dummy', error_msg_tmpl % os.path.basename(spec))
error_msg_tmpl = "%s should use 'system' toolchain rather than deprecated 'dummy' toolchain"
self.assertFalse(ec['toolchain']['name'] == 'dummy', error_msg_tmpl % os.path.basename(spec))

# make sure that $root is not used, since it is not compatible with module files in Lua syntax
res = re.findall(r'.*\$root.*', ec.rawtxt, re.M)
Expand Down