Skip to content

add support for software minver template (like %(pyminver)s, etc.) #3344

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

Merged
boegel merged 2 commits into from
May 24, 2020
Merged

add support for software minver template (like %(pyminver)s, etc.) #3344

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
c5bce52
support for software minver template
ekouts May 20, 2020
e1088db
fix typos
ekouts May 20, 2020
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
1 change: 1 addition & 0 deletions easybuild/framework/easyconfig/templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ def template_constant_dict(config, ignore=None, skip_lower=None, toolchain=None)
template_values['%sver' % pref] = dep_version
dep_version_parts = dep_version.split('.')
template_values['%smajver' % pref] = dep_version_parts[0]
template_values['%sminver' % pref] = dep_version_parts[1]
template_values['%sshortver' % pref] = '.'.join(dep_version_parts[:2])
break

Expand Down
24 changes: 14 additions & 10 deletions test/framework/easyconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,11 +968,11 @@ def test_templating(self):
' ("R", "3.2.3"),'
']',
'modloadmsg = "%s"' % '; '.join([
'CUDA: %%(cudaver)s, %%(cudamajver)s, %%(cudashortver)s',
'Java: %%(javaver)s, %%(javamajver)s, %%(javashortver)s',
'Python: %%(pyver)s, %%(pymajver)s, %%(pyshortver)s',
'Perl: %%(perlver)s, %%(perlmajver)s, %%(perlshortver)s',
'R: %%(rver)s, %%(rmajver)s, %%(rshortver)s',
'CUDA: %%(cudaver)s, %%(cudamajver)s, %%(cudaminver)s, %%(cudashortver)s',
'Java: %%(javaver)s, %%(javamajver)s, %%(javaminver)s, %%(javashortver)s',
'Python: %%(pyver)s, %%(pymajver)s, %%(pyminver)s, %%(pyshortver)s',
'Perl: %%(perlver)s, %%(perlmajver)s, %%(perlminver)s, %%(perlshortver)s',
'R: %%(rver)s, %%(rmajver)s, %%(rminver)s, %%(rshortver)s',
]),
'license_file = HOME + "/licenses/PI/license.txt"',
"github_account = 'easybuilders'",
Expand Down Expand Up @@ -1002,11 +1002,11 @@ def test_templating(self):
dirs1 = eb['sanity_check_paths']['dirs'][1]
self.assertTrue(lib_arch_regex.match(dirs1), "Pattern '%s' matches '%s'" % (lib_arch_regex.pattern, dirs1))
self.assertEqual(eb['homepage'], "http://example.com/P/p/v3/")
expected = ("CUDA: 10.1.105, 10, 10.1; "
"Java: 1.7.80, 1, 1.7; "
"Python: 2.7.10, 2, 2.7; "
"Perl: 5.22.0, 5, 5.22; "
"R: 3.2.3, 3, 3.2")
expected = ("CUDA: 10.1.105, 10, 1, 10.1; "
"Java: 1.7.80, 1, 7, 1.7; "
"Python: 2.7.10, 2, 7, 2.7; "
"Perl: 5.22.0, 5, 22, 5.22; "
"R: 3.2.3, 3, 2, 3.2")
self.assertEqual(eb['modloadmsg'], expected)
self.assertEqual(eb['license_file'], os.path.join(os.environ['HOME'], 'licenses', 'PI', 'license.txt'))

Expand Down Expand Up @@ -1668,9 +1668,11 @@ def test_external_dependencies_templates(self):

expected_template_values = {
'perlmajver': '5',
'perlminver': '30',
'perlshortver': '5.30',
'perlver': '5.30.0',
'pymajver': '3',
'pyminver': '6',
'pyshortver': '3.6',
'pyver': '3.6.5',
}
Expand Down Expand Up @@ -2822,6 +2824,7 @@ def test_template_constant_dict(self):

expected = {
'javamajver': '1',
'javaminver': '8',
'javashortver': '1.8',
'javaver': '1.8.0_221',
'name': 'toy',
Expand All @@ -2831,6 +2834,7 @@ def test_template_constant_dict(self):
'toolchain_version': 'system',
'nameletterlower': 't',
'pymajver': '3',
'pyminver': '7',
'pyshortver': '3.7',
'pyver': '3.7.2',
'version': '0.01',
Expand Down