Allow templates in custom_paths & custom_commands sanity-check arguments#4679
Merged
boegel merged 5 commits intoeasybuilders:developfrom Dec 11, 2024
Merged
Allow templates in custom_paths & custom_commands sanity-check arguments#4679boegel merged 5 commits intoeasybuilders:developfrom
custom_paths & custom_commands sanity-check arguments#4679boegel merged 5 commits intoeasybuilders:developfrom
Conversation
When using `multi_deps` the dry-run sanity check step should be run multiple times just as is done in the real build. However the decision which method to call is made before calling `_sanity_check_step_multi_deps` and that doesn't check for dry-run. Factor out a dispatch method that can be called during the iteration of the multiple dependencies and use that in both cases.
`easyblocks_dir` already exists so no need to re-compute it as `new_dir`
1 task
…guments E.g. for Python packages we (almost) always want to check for `lib/python%(pyshortver)s` and potentially add additional paths from EasyConfigs. Currently a workaround is used that sets the parameter in the easyconfig when it isn't set already which is against the semantics of `enhance_sanity_check`. This change allows this in a trivial way.
Flamefire
force-pushed
the
resolve-custom-cmds
branch
from
1f34450 to
93db711
Compare
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
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.
E.g. for Python packages we (almost) always want to check for
lib/python%(pyshortver)sand potentially add additional paths from EasyConfigs.Currently a workaround is used that sets the parameter in the easyconfig when it isn't set already which is against the semantics of
enhance_sanity_check.This change allows this in a trivial way.
The added test just uses
multi_depswhich covers the case without it already, so no need for 2 similar ones.To make it "realistic" add dummy Python ECs to use as dependencies such that we can use
%(pyshortver)sRequires
resolve_templatemethod toEasyConfigclass #4677multi_deps#4678I included those PRs here though such that CI passes and either all commits can be reviewed together or just the last one which is the described change.