Skip to content

sync with develop (20241218) + version bump to 5.0.0beta1#4724

Merged
lexming merged 19 commits intoeasybuilders:5.0.xfrom
boegel:5.0.x
Dec 18, 2024
Merged

sync with develop (20241218) + version bump to 5.0.0beta1#4724
lexming merged 19 commits intoeasybuilders:5.0.xfrom
boegel:5.0.x

Conversation

@boegel
Copy link
Copy Markdown
Member

@boegel boegel commented Dec 18, 2024

Trivial merge conflicts fixed, also includes version bump to 5.0.0beta1

Flamefire and others added 17 commits October 10, 2024 18:07
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`
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.
The dict gets initialized by `parse` during `__init__` and hence cannot
be empty or unset.
fix dry-run output when using `multi_deps`
…w_pr_iTvtXUcswP

Add `resolve_template` method to `EasyConfig` class
Allow templates in `custom_paths` & `custom_commands` sanity-check arguments
@boegel boegel added update EasyBuild-5.0 EasyBuild 5.0 labels Dec 18, 2024
@boegel boegel added this to the 5.0 milestone Dec 18, 2024
@boegel boegel changed the title sync with develop (20241218) sync with develop (20241218) + version bump to 5.0.0beta1 Dec 18, 2024
@lexming lexming enabled auto-merge December 18, 2024 13:30
Copy link
Copy Markdown
Contributor

@Micket Micket left a comment

Choose a reason for hiding this comment

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

lgtm

@lexming lexming merged commit 64bd214 into easybuilders:5.0.x Dec 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants