Skip to content
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.

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

Allow templates in custom_paths & custom_commands sanity-check arguments #4679

Merged
merged 5 commits into from
Dec 11, 2024

Conversation

Flamefire
Copy link
Contributor

@Flamefire Flamefire commented Oct 11, 2024

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.

The added test just uses multi_deps which 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)s

Requires

I 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.

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`
…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 Flamefire force-pushed the resolve-custom-cmds branch from 1f34450 to 93db711 Compare October 11, 2024 09:13
@boegel boegel added this to the release after 4.9.4 milestone Oct 12, 2024
Copy link
Member

@boegel boegel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@boegel boegel merged commit 5661bf5 into easybuilders:develop Dec 11, 2024
37 checks passed
@Flamefire Flamefire deleted the resolve-custom-cmds branch December 11, 2024 11:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants