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

Support pyo3-ffi #804

Merged
merged 7 commits into from
Feb 9, 2022
Merged

Support pyo3-ffi #804

merged 7 commits into from
Feb 9, 2022

Conversation

ijl
Copy link
Contributor

@ijl ijl commented Feb 8, 2022

No description provided.

@netlify
Copy link

netlify bot commented Feb 8, 2022

✔️ Deploy Preview for maturin-guide canceled.

🔨 Explore the source changes: 14e5227

🔍 Inspect the deploy log: https://app.netlify.com/sites/maturin-guide/deploys/62037d60c55170000831ce3e

"You have selected the `abi3` feature but not a minimum version (e.g. the `abi3-py36` feature). \
maturin needs a minimum version feature to build abi3 wheels."
)
for &lib in PYO3_BINDING_CRATES.iter() {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I looked at refactoring to BridgeModel::Bindings::Pyo3 and BridgeModel::Bindings::Pyo3Ffi but it was a much larger change.

@ijl
Copy link
Contributor Author

ijl commented Feb 8, 2022

I've tested this on orjson and a test crate pyo3-ffi-pure. That crate can't be added to CI until a new pyo3 is released, but you're welcome to cherry-pick or start from this commit without preserving authorship. d873dd5

@messense
Copy link
Member

messense commented Feb 9, 2022

❯ rg 'is_bindings\("pyo3"\)'
src/compile.rs
252:            if bindings_crate.is_bindings("pyo3") {

src/python_interpreter.rs
553:            if matches!(bridge, BridgeModel::Cffi) || bridge.is_bindings("pyo3") {

These places should also take pyo3-ffi into account.

@messense
Copy link
Member

messense commented Feb 9, 2022

I've tested this on orjson and a test crate pyo3-ffi-pure. That crate can't be added to CI until a new pyo3 is released, but you're welcome to cherry-pick or start from this commit without preserving authorship. d873dd5

We can use git dependency for pyo3-ffi.

@messense messense merged commit c8664a7 into PyO3:main Feb 9, 2022
@messense
Copy link
Member

messense commented Feb 9, 2022

Thank you @ijl !

@messense
Copy link
Member

messense commented Feb 9, 2022

v0.12.10_beta.1 is out for testing.

@ijl
Copy link
Contributor Author

ijl commented Feb 9, 2022

Thanks for fixing it up and merging.

@ijl ijl deleted the pyo3-ffi branch February 9, 2022 16:41
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