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

Use assertRegex instead of deprecated assertRegexpMatches v2 #7576

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

janvrany
Copy link
Contributor

@janvrany janvrany commented Dec 2, 2024

This PR is another stab on using assertRegex instead of assertRegexpMatches (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 assertRegexpMatches to assertRegex. The second commit monkey-patches class to provide the latter when not available (i.e., on Python < 3.2).

0xdaryl and others added 2 commits May 24, 2024 07:58
`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 <[email protected]>
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.
@janvrany janvrany requested a review from mstoodle as a code owner December 2, 2024 11:21
@janvrany
Copy link
Contributor Author

janvrany commented Dec 2, 2024

jenkins build all

@janvrany
Copy link
Contributor Author

janvrany commented Dec 2, 2024

Both Linux RISC-V and OSX AArch64 failures seems unrelated - some CI hiccups?

@janvrany
Copy link
Contributor Author

janvrany commented Dec 2, 2024

jenkins build riscv

3 similar comments
@janvrany
Copy link
Contributor Author

janvrany commented Dec 2, 2024

jenkins build riscv

@janvrany
Copy link
Contributor Author

janvrany commented Dec 4, 2024

jenkins build riscv

@janvrany
Copy link
Contributor Author

jenkins build riscv

@janvrany
Copy link
Contributor Author

jenkins build amac

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants