Use assertRegex instead of deprecated assertRegexpMatches v2 - #7576
Merged
mstoodle merged 2 commits intoJan 6, 2025
Merged
Conversation
`assertRegexpMatches` was renamed to `assertRegex` in Python 3.2 and has been removed entirely in Python 3.10. Our CI systems should all have at least Python 3.2. Rename uses to `assertRegex`. Fixes: eclipse-omr#7181 Signed-off-by: Daryl Maier <maier@ca.ibm.com>
Previous commit renamed `assertRegexpMatches` to `assertRegex` as the former has been removed in Python 3.12. However, at the time of writing, not all CI build agents have been upgraded to Python >= 3.2. At the same time, some agents have Python 3.12 and cannot be easily downgraded (e.g., RISC-V). This commit provides a compatibility with Python < 3.2 by implementing `assertRegex` by means of `assertRegexpMatches` if `assertRegex` is not available. This way, JitBuilder API gen tests should pass everywhere. Once all CI nodes are upgraded, this commit can be reverted.
Contributor
Author
|
jenkins build all |
Contributor
Author
|
Both Linux RISC-V and OSX AArch64 failures seems unrelated - some CI hiccups? |
Contributor
Author
|
jenkins build riscv |
3 similar comments
Contributor
Author
|
jenkins build riscv |
Contributor
Author
|
jenkins build riscv |
Contributor
Author
|
jenkins build riscv |
Contributor
Author
|
jenkins build amac |
mstoodle
approved these changes
Jan 6, 2025
mstoodle
left a comment
mstoodle
left a comment
Contributor
There was a problem hiding this comment.
Looks good to me. Thanks for addressing the compatibility issue that's been preventing us from committing this fix, which means some of us have been maintaining the fix privately and awkwardly)
janvrany
deleted the
pr/jitbuilder-fix-deprecated-method-in-apigen-tests
branch
January 6, 2025 15:40
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
3 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.
This PR is another stab on using
assertRegexinstead ofassertRegexpMatches(previous attempts: #7279, #7496)What prompted me to get back to this again is recent work on reviving RISC-V build using Eclipse-provided native build agents (#7530, #7556).
This PR contains @0xdaryl's original commit changing
assertRegexpMatchestoassertRegex. The second commit monkey-patches class to provide the latter when not available (i.e., on Python < 3.2).