Skip to content

include easyblocks from multiple PRs at the same time #3792

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

Draft
migueldiascosta wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

include easyblocks from multiple PRs at the same time #3792

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daa0679
include easyblocks from multiple PRs at the same time
migueldiascosta Jul 31, 2021
dc26050
Merge branch 'develop' of https://github.com/easybuilders/easybuild-f…
migueldiascosta Oct 20, 2021
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
5 changes: 4 additions & 1 deletion easybuild/tools/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1578,6 +1578,7 @@ def set_up_configuration(args=None, logfile=None, testing=False, silent=False):
included_paths = expand_glob_paths(eb_go.options.include_easyblocks)
included_from_file = set([os.path.basename(eb) for eb in included_paths])

easyblocks_from_all_prs = []
for easyblock_pr in easyblock_prs:
easyblocks_from_pr = fetch_easyblocks_from_pr(easyblock_pr)
included_from_pr = set([os.path.basename(eb) for eb in easyblocks_from_pr])
Expand All @@ -1593,7 +1594,9 @@ def set_up_configuration(args=None, logfile=None, testing=False, silent=False):
for easyblock in included_from_pr:
print_msg("easyblock %s included from PR #%s" % (easyblock, easyblock_pr), log=log)

include_easyblocks(eb_go.options.tmpdir, easyblocks_from_pr)
easyblocks_from_all_prs.extend(easyblocks_from_pr)

include_easyblocks(eb_go.options.tmpdir, easyblocks_from_all_prs)

if eb_go.options.list_easyblocks:
msg = list_easyblocks(eb_go.options.list_easyblocks, eb_go.options.output_format)
Expand Down