sync with develop (20250303) #4786
Merged
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
It might be required to replace patterns with more context, e.g. content of the next or previous line to disambiguate otherwise too generic matches. Add parameter `single_line` to enable the old behavior (default) of matching per line and otherwise match the whole text. Add parameter `match_all` to require all patterns to match for each file not only at least one.
If we have other classes next to a software specific easyblock class in an easyblock file they are likely supplemental. So ignore them in `avail_easyblocks`.
- Reduce indentation - Assign directly to dict
The class name regex is MULTILINE and hence might start a match at a class name without a super-class and match until another class name with a super-class Restrict by excluding colons in addition to parentheses Also add test for this and the multi-class case to a generic easyblock
Unrelated class in an easyblock file have the same package name as the easyblock and hence the filter doesn't remove them. Instead of the package name check if the class derives from `EasyBlock` which is a much more reliable check whether the class is an EasyBlock.
…asyblocks based on 'EB_' prefix
…ement enhance `apply_regex_substitutions` to support use of multi-line patterns, requiring matching all patterns in each file, and use pre-compiled regular expressions
…locks Ignore other classes if software specific easyblock class was found
jfgrimm
approved these changes
Mar 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
includes:
apply_regex_substitutionsto support use of multi-line patterns, requiring matching all patterns in each file, and use pre-compiled regular expressions #4758