allow extensions to add text to the module file #4652
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Flamefire
force-pushed
the
module_text_from_extensions
branch
2 times, most recently
from
1759ad1 to
8a0b143
Compare
Flamefire
force-pushed
the
module_text_from_extensions
branch
2 times, most recently
from
138757f to
224f494
Compare
|
@Flamefire Can you look into resolving the merge conflict? |
Flamefire
force-pushed
the
module_text_from_extensions
branch
from
56dea43 to
10764d7
Compare
|
Did a full rebase to make the commits easier to read in EB 5.x |
boegel
modified the milestones:
next release (5.0.1 or 5.1.0),
release after next release (5.0.1 or 5.1.0)
Flamefire
force-pushed
the
module_text_from_extensions
branch
from
10764d7 to
aebde1e
Compare
|
Rebased |
The different options for the module footers did not have consistent newline handling: - modtclfooter & modluafooter did append a line break - modules_footer (cmdline) did not Make sure all end with a new line such that they work in combination especially with the EasyBuild version comment moved to the bottom
Introduce `make_extension_module_extra` which gets called during module file creation for every extension similar to `make_module_extra`. This ensures it will also be called for parallel extension or --module-only builds. Fixes easybuilders#4647
This is always equal to `self.exts` as skipping is done on `self.ext_instances`.
Flamefire
force-pushed
the
module_text_from_extensions
branch
from
aebde1e to
9773dd3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Introduce
make_extension_module_extrawhich gets called during modulefile creation for every extension similar to
make_module_extra.This ensures it will also be called for parallel extension or --module-only builds.
Fixes #4647
I'm open for a better name but
make_module_extra_extensionsalready exists somake_module_extra_extensionmight be confusing.Currently the (now deprecated) feature is only used by the numpy easyblock to add the numpy includes to
$CPATH. So that easyblock needs to be updated. I'd argue that we shouldn't add the numpy includes as a regularpip install numpydoesn't do that either. So if a user updates the numpy in a virtualenv using our current approach might end up using headers from one numpy and libs/python files from another.However I'm not sure if (and why) other software we have already relies on that. One which did will be fixed by easybuilders/easybuild-easyconfigs#21467