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

[cppyy] Sync cppyy_backend/loader.py with upstream #17627

Merged
merged 2 commits into from
Feb 6, 2025

Conversation

guitargeek
Copy link
Contributor

@guitargeek guitargeek commented Feb 5, 2025

Reverts commit 834f8f3 and move setting the hardcoded cppyy backend
path to the ROOT module, to get rid of a patch.

Sync the load_cpp_backend function with upsteam while at it.

@guitargeek guitargeek self-assigned this Feb 5, 2025
@guitargeek guitargeek changed the title [PyROOT] Revert workaround for MacOs12 with soversion in cppyy-backend [cppyy] Sync load_cpp_backend with upsteam backend Feb 5, 2025
Copy link
Member

@vepadulano vepadulano left a comment

Choose a reason for hiding this comment

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

Nice! Feel free to merge if CI agrees

@guitargeek guitargeek force-pushed the 9725 branch 2 times, most recently from 68635bb to fce6e1a Compare February 5, 2025 18:24
Copy link

github-actions bot commented Feb 6, 2025

Test Results

    18 files      18 suites   4d 0h 9m 10s ⏱️
 2 690 tests  2 328 ✅ 0 💤 362 ❌
46 724 runs  46 003 ✅ 0 💤 721 ❌

For more details on these failures, see this check.

Results for commit fce6e1a.

@guitargeek guitargeek changed the title [cppyy] Sync load_cpp_backend with upsteam backend [cppyy] Sync cppyy_backend/loader.py with upstream Feb 6, 2025
To further reduce the code divergence.

The patch for `macOS` is still required, but it is updated and renamed
to make clear that it's not only relevant for macOS 12.
Remove patches that were either merged upstream or that are not
necessary anymore.
Copy link
Member

@vepadulano vepadulano left a comment

Choose a reason for hiding this comment

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

Even with the current changes, it's still an improvement, thanks!

@guitargeek guitargeek merged commit 75c16f0 into root-project:master Feb 6, 2025
17 of 20 checks passed
@guitargeek guitargeek deleted the 9725 branch February 6, 2025 15:57
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