Skip to content

allow versionsuffix to be set to None in det_full_ec_version #4292

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
lexming merged 1 commit into from
Jul 5, 2023
Merged

allow versionsuffix to be set to None in det_full_ec_version #4292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions easybuild/tools/module_naming_scheme/utilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,16 @@ def det_full_ec_version(ec):

# prepend/append version prefix/suffix
versionprefix = ec.get('versionprefix', '')
if not isinstance(versionprefix, string_type):
if versionprefix and not isinstance(versionprefix, string_type):
raise EasyBuildError("versionprefix value should be a string, found '%s': %s (full spec: %s)",
type(versionprefix).__name__, versionprefix, ec)

versionsuffix = ec.get('versionsuffix', '')
if not isinstance(versionsuffix, string_type):
if versionsuffix and not isinstance(versionsuffix, string_type):
raise EasyBuildError("versionsuffix value should be a string, found '%s': %s (full spec: %s)",
type(versionsuffix).__name__, versionsuffix, ec)

ecver = ''.join([x for x in [versionprefix, ecver, versionsuffix] if x])
ecver = ''.join([x for x in [versionprefix or '', ecver, versionsuffix or ''] if x])

return ecver

Expand Down
6 changes: 6 additions & 0 deletions test/framework/easyconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,12 @@ def test_installversion(self):
# only version key is strictly needed
self.assertEqual(det_full_ec_version({'version': '1.2.3'}), '1.2.3')

# versionprefix/versionsuffix can also be set to None,
# see https://github.com/easybuilders/easybuild-framework/issues/4281
cfg['versionprefix'] = None
cfg['versionsuffix'] = None
self.assertEqual(det_full_ec_version(cfg), '3.14')

# check how faulty dep spec is handled
faulty_dep_spec = {
'name': 'test',
Expand Down