Skip to content

Expand ~ in include paths#1774

Merged
boegel merged 6 commits intoeasybuilders:developfrom
tobbez:patch-0
May 23, 2016
Merged

Expand ~ in include paths#1774
boegel merged 6 commits intoeasybuilders:developfrom
tobbez:patch-0

Conversation

@tobbez
Copy link
Copy Markdown
Contributor

@tobbez tobbez commented May 20, 2016

Paths/globs specified to e.g. --include-easyblocks are currently not expanded if they reference a home directory using ~ (e.g. --include-easyblocks=~/eb/block.py or --include-easyblocks=~user/eb/block.py).

This can get a bit confusing since specifying the path in the same way using the environment variable (EASYBUILD_INCLUDE_EASYBLOCKS) works, because the ~ is expanded by the shell in that case.

@boegel boegel added this to the v2.9.0 milestone May 20, 2016
@boegel
Copy link
Copy Markdown
Member

boegel commented May 20, 2016

@tobbez patch looks great, thanks!

To make this complete, we should add a test in test/framework/filetools.py to make sure we don't break this in the future, and maybe also in test/framework/include.py to make sure --include-* keeps honouring it

Please let us know if you're up for this; if not, I can help out.

@boegel boegel modified the milestones: v2.8.1, v2.9.0 May 21, 2016
@boegel
Copy link
Copy Markdown
Member

boegel commented May 21, 2016

@tobbez I implemented tests that check for this change in https://github.com/tobbez/easybuild-framework/pull/1, please review/merge.

add/enhance tests to verify expanding of ~
@tobbez
Copy link
Copy Markdown
Contributor Author

tobbez commented May 23, 2016

@boegel Done.

@boegel
Copy link
Copy Markdown
Member

boegel commented May 23, 2016

@tobbez thanks! Travis is reporting that one of the new tests fails, due to an oversight by me, which is fixed by https://github.com/tobbez/easybuild-framework/pull/2, can you please merge that too?

Then this is good to go, I'll include it in the upcoming EasyBuild v2.8.1 (which will be released because of fixing #1775).

compare *sorted* result of expand_glob_paths in test
@boegel
Copy link
Copy Markdown
Member

boegel commented May 23, 2016

Good to go, thanks @tobbez!

@boegel boegel merged commit e15c7b2 into easybuilders:develop May 23, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants