Skip to content

Attach source_urls directly to sources for components in generic Bundle easyblock #1711

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 6 commits into from
May 7, 2019
Merged

Attach source_urls directly to sources for components in generic Bundle easyblock #1711

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
223db76
Attach source_urls directly to sources for components
May 6, 2019
2337e74
Allow for the fact that sources can be a dict
May 6, 2019
f12b497
Correctly update the source dict
May 6, 2019
174973d
Need to update list with list
May 6, 2019
3a36d07
Need to update list with list
May 7, 2019
86bbf94
Address comments
May 7, 2019
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
22 changes: 16 additions & 6 deletions easybuild/easyblocks/generic/bundle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,25 @@ def __init__(self, *args, **kwargs):

# 'sources' is strictly required
if cfg['sources']:
# add component sources to list of sources
self.cfg.update('sources', cfg['sources'])
# If per-component source URLs are provided, attach them directly to the relevant sources
if cfg['source_urls']:
for source in cfg['sources']:
if isinstance(source, basestring):
self.cfg.update('sources', [{'filename': source, 'source_urls': cfg['source_urls']}])
elif isinstance(source, dict):
# Update source_urls in the 'source' dict to use the one for the components
# (if it doesn't already exist)
comp_source_urls = source.get('source_urls', cfg['source_urls'])
self.cfg.update('sources', [source.update('source_urls', comp_source_urls)])
else:
raise EasyBuildError("Source %s for component %s is neither a string nor a dict, cannot "
"process it.", source, cfg['name'])
else:
# add component sources to list of sources
self.cfg.update('sources', cfg['sources'])
else:
raise EasyBuildError("No sources specification for component %s v%s", comp_name, comp_version)

if cfg['source_urls']:
# add per-component source_urls to list of bundle source_urls, expanding templates
self.cfg.update('source_urls', cfg['source_urls'])

if cfg['checksums']:
src_cnt = len(cfg['sources'])

Expand Down