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 #5252

Merged
merged 5 commits into from
Jul 19, 2024
Merged

Conversation

rwgk
Copy link
Collaborator

@rwgk rwgk commented Jul 19, 2024

Description

Helper/scratch PR for testing.

Suggested changelog entry:

rgommers and others added 5 commits July 17, 2024 23:26
…ed` (pybind#5250)

This follows up on PR 5148, which introduced support for free-threaded CPython.
* tests: run on pyodide

Signed-off-by: Henry Schreiner <[email protected]>

* ci: use cibuildwheel for pyodide test

Signed-off-by: Henry Schreiner <[email protected]>

* tests: revert changes to test_embed

Signed-off-by: Henry Schreiner <[email protected]>

---------

Signed-off-by: Henry Schreiner <[email protected]>
* Factor out detail/value_and_holder.h (from detail/type_caster_base.h)

This is in support of PR pybind#5213:

* trampoline_self_life_support.h depends on value_and_holder.h

* type_caster_base.h depends on trampoline_self_life_support.h

* Fix a minor and inconsequential inconsistency in `copyable_holder_caster`: the correct `load_value()` return type is `void` (as defined in `type_caster_generic`)

For easy future reference, this is the long-standing inconsistency:

* https://github.com/pybind/pybind11/blob/dbf848aff7c37ef8798bc9459a86193e28b1032f/include/pybind11/detail/type_caster_base.h#L634

* https://github.com/pybind/pybind11/blob/dbf848aff7c37ef8798bc9459a86193e28b1032f/include/pybind11/cast.h#L797

Noticed in passing while working on PR pybind#5213.

* Add `DANGER ZONE` comment in detail/init.h, similar to a comment added on the smart_holder branch (all the way back in 2021).
…/value_and_holder.h"` in trampoline_self_life_support.h. This was made possible by PR pybind#5251.
@rwgk rwgk merged commit e933e21 into pybind:smart_holder Jul 19, 2024
156 checks passed
@github-actions github-actions bot added the needs changelog Possibly needs a changelog entry label Jul 19, 2024
@rwgk rwgk removed the needs changelog Possibly needs a changelog entry label Jul 19, 2024
@rwgk rwgk deleted the sh_merge_master branch July 19, 2024 04:15
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.

3 participants