add support for --include-easyblocks-from-pr (REVIEW) #3206
Conversation
easybuild/main.py
Outdated
| @@ -199,6 +200,10 @@ def main(args=None, logfile=None, do_build=None, testing=False, modtool=None): | |||
| eb_go, cfg_settings = set_up_configuration(args=args, logfile=logfile, testing=testing) | |||
| options, orig_paths = eb_go.options, eb_go.args | |||
|
|
|||
| if options.include_easyblocks_from_pr: | |||
| included_easyblocks = fetch_easyblocks_from_pr(options.include_easyblocks_from_pr) | |||
| include_easyblocks(options.tmpdir, included_easyblocks) | |||
There was a problem hiding this comment.
not sure if this is the correct tmpdir
There was a problem hiding this comment.
You better create a subdirectory in self.tmpdir, to avoid that --include-easyblocks and --include-easyblocks-from-pr step on each others toes if both options are used at the same time.
Or we tweak the include_easyblocks function to use tempfile.mkdtemp to create a subdirectory in the path that it is given, that's probably a better options in the long run:
easyblocks_path = tempfile.mkdtemp(prefix=tmpdir, os.path.join(dir=tmpdir, prefix='included-easyblocks-')Ideally, we also have this use case covered of using both --include-easyblocks* options in the tests...
There was a problem hiding this comment.
hm, when looking into adding a test for the use of both --include-easyblocks* options, I noticed that --list-easyblocks doesn't take into account the easyblocks from a PR, because it's done in the options.postprocess step, before set_up_configuration...
migueldiascosta
changed the title
easybuild/main.py
Outdated
| @@ -199,6 +200,10 @@ def main(args=None, logfile=None, do_build=None, testing=False, modtool=None): | |||
| eb_go, cfg_settings = set_up_configuration(args=args, logfile=logfile, testing=testing) | |||
| options, orig_paths = eb_go.options, eb_go.args | |||
|
|
|||
| if options.include_easyblocks_from_pr: | |||
| included_easyblocks = fetch_easyblocks_from_pr(options.include_easyblocks_from_pr) | |||
| include_easyblocks(options.tmpdir, included_easyblocks) | |||
There was a problem hiding this comment.
You better create a subdirectory in self.tmpdir, to avoid that --include-easyblocks and --include-easyblocks-from-pr step on each others toes if both options are used at the same time.
Or we tweak the include_easyblocks function to use tempfile.mkdtemp to create a subdirectory in the path that it is given, that's probably a better options in the long run:
easyblocks_path = tempfile.mkdtemp(prefix=tmpdir, os.path.join(dir=tmpdir, prefix='included-easyblocks-')Ideally, we also have this use case covered of using both --include-easyblocks* options in the tests...
… using both --include-easyblocks options
…ramework into include_easyblocks_from_pr
easybuild/tools/github.py
Outdated
| if github_repo == GITHUB_EASYCONFIGS_REPO: | ||
| path = build_option('pr_path') | ||
| elif github_repo == GITHUB_EASYBLOCKS_REPO: | ||
| path = 'ebs_pr%s' % pr |
There was a problem hiding this comment.
This should be a subdirectory of the temporary directory set up for this EasyBuild session.
Right now, it's a relative path, which means this directory gets created in the current working directory (and worse, stays there).
use subdir in temp dir for easyblocks downloaded from PR
No description provided.