Skip to content

Commit af0d1db

Browse files
committed
Use namelower as default for github_account
1 parent 93910c9 commit af0d1db

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

easybuild/framework/easyconfig/default.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@
9090
'easyblock': [None, "EasyBlock to use for building; if set to None, an easyblock is selected "
9191
"based on the software name", BUILD],
9292
'easybuild_version': [None, "EasyBuild-version this spec-file was written for", BUILD],
93-
'github_account': [None, "GitHub account name to be used to resolve template values in source URLs", BUILD],
93+
'github_account': ['%(namelower)s', "GitHub account name to be used to resolve template values in source URLs",
94+
BUILD],
9495
'hidden': [False, "Install module file as 'hidden' by prefixing its version with '.'", BUILD],
9596
'installopts': ['', 'Extra options for installation', BUILD],
9697
'maxparallel': [None, 'Max degree of parallelism', BUILD],

easybuild/framework/easyconfig/templates.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@
9191
('FTPGNOME_SOURCE', 'http://ftp.gnome.org/pub/GNOME/sources/%(namelower)s/%(version_major_minor)s',
9292
'http download for gnome ftp server'),
9393
('GITHUB_SOURCE', 'https://github.com/%(github_account)s/%(name)s/archive',
94-
'GitHub source URL (requires github_account easyconfig parameter to be specified)'),
94+
'GitHub source URL (namelower is used if github_account easyconfig parameter is not specified)'),
9595
('GITHUB_LOWER_SOURCE', 'https://github.com/%(github_account)s/%(namelower)s/archive',
96-
'GitHub source URL (lowercase name, requires github_account easyconfig parameter to be specified)'),
96+
'GitHub source URL (lowercase name, namelower is used if github_account easyconfig parameter is not specified)'),
9797
('GNU_SAVANNAH_SOURCE', 'http://download-mirror.savannah.gnu.org/releases/%(namelower)s',
9898
'download.savannah.gnu.org source url'),
9999
('GNU_SOURCE', 'http://ftpmirror.gnu.org/gnu/%(namelower)s',

test/framework/easyconfig.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1910,7 +1910,7 @@ def test_template_constant_dict(self):
19101910

19111911
expected = {
19121912
'bitbucket_account': 'gzip',
1913-
'github_account': None,
1913+
'github_account': 'gzip',
19141914
'name': 'gzip',
19151915
'nameletter': 'g',
19161916
'toolchain_name': 'goolf',
@@ -1930,7 +1930,7 @@ def test_template_constant_dict(self):
19301930

19311931
expected = {
19321932
'bitbucket_account': 'toy',
1933-
'github_account': None,
1933+
'github_account': 'toy',
19341934
'name': 'toy',
19351935
'nameletter': 't',
19361936
'toolchain_name': 'dummy',

0 commit comments

Comments
 (0)