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

[smart_holder] git merge master #5527

Merged
merged 2 commits into from
Feb 16, 2025
Merged

Conversation

rwgk
Copy link
Collaborator

@rwgk rwgk commented Feb 16, 2025

Description

Helper/scratch PR for testing.

Suggested changelog entry:

rwgk and others added 2 commits February 16, 2025 11:01
…bind#5522)

* Backport of google/pybind11clif#30088 (main PR) and google/pybind11clif#30092 (minor fixes).

Note for completeness:

These are identical to the current versions on the pybind11clif main branch (@ commit 4841661df5daf26ecdedaace54e64d0782e63f64):

* test_class_release_gil_before_calling_cpp_dtor.cpp
* test_class_release_gil_before_calling_cpp_dtor.py

* Fix potential data race in test_class_release_gil_before_calling_cpp_dtor.cpp

The original intent was to let the singleton leak, but making that tread-safe is slightly more involved than this solution. It's totally fine in this case if the RegistryType destructor runs on process teardown.

See also: pybind#5522 (comment)

---------

Co-authored-by: Ralf W. Grosse-Kunstleve <rwgk@google.com>
@rwgk
Copy link
Collaborator Author

rwgk commented Feb 16, 2025

I'm ignoring the pre-commit.ci "error during build". pre-commit run --all-files succeeds locally, therefore I'm almost certain it's just a transient infrastructure failure.

@rwgk rwgk merged commit ad0d55a into pybind:smart_holder Feb 16, 2025
77 of 78 checks passed
@rwgk rwgk deleted the sh_merge_master branch February 16, 2025 22:10
@github-actions github-actions bot added the needs changelog Possibly needs a changelog entry label Feb 16, 2025
@rwgk rwgk removed the needs changelog Possibly needs a changelog entry label Feb 16, 2025
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.

1 participant