Skip to content

Initial abi3t support - #15063

Merged
alex merged 17 commits into
pyca:mainfrom
ngoldbaum:abi3t
Jul 6, 2026
Merged

Initial abi3t support#15063
alex merged 17 commits into
pyca:mainfrom
ngoldbaum:abi3t

Conversation

@ngoldbaum

@ngoldbaumngoldbaum commented Jun 18, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

Build abi3t wheels on python 3.15 and newer.

alex
alex reviewed Jun 18, 2026
View reviewed changes
Comment threadsrc/rust/cryptography-cffi/build.rs Outdated
Comment threadsrc/rust/cryptography-cffi/build.rs Outdated
Comment threadsrc/rust/cryptography-cffi/build.rs Outdated
@alex

alex commented Jun 18, 2026

Copy link
Copy Markdown
Member

Thanks for working on this!

ngoldbaum
ngoldbaum commented Jun 18, 2026
View reviewed changes
Comment threadsrc/rust/cryptography-cffi/build.rs Outdated
ngoldbaum
ngoldbaum commented Jun 18, 2026
View reviewed changes
Comment threadpyproject.toml Outdated
This was referenced Jun 18, 2026
Merged
Merged
@ngoldbaumngoldbaum mentioned this pull request Jun 18, 2026
Merged
@ngoldbaum

ngoldbaum commented Jun 18, 2026

Copy link
Copy Markdown
ContributorAuthor

OK great, it looks like the only failing CI jobs use a Rust compiler that's too old to build Maturin. There are two Windows jobs that timed out but I'm not worried about that because building Maturin on Windows is very slow.

I opened PyO3/maturin#3233 to fix the bug in Maturin.

I'll try to work on getting the CFFI and Maturin PRs that I'm depending on here merged.

@alex

alex commented Jun 18, 2026

Copy link
Copy Markdown
Member

In practice those iwll be solved by a maturin release with wheels

messense pushed a commit to PyO3/maturin that referenced this pull request Jun 19, 2026
@ngoldbaum
Set PYO3_PYTHON to run scripts for stable ABI builds (#3233)
37cbb4a
The `&& !force_target_abi` was [introduced incorrectly by
me](https://github.com/PyO3/maturin/blame/main/src/compile.rs#L898) in
#3226 and hasn't yet shown up in a release. I hit this testing abi3t
builds for cryptography with from-source builds of maturin:
pyca/cryptography#15063.
To better help Maturin's CI catch issues that are load-bearing for the
cryptography project, I also added a test crate that uses CFFI like
cryptography does: cooperatively with PyO3 and using PYO3_PYTHON to
shell out and run a CFFI script.
I manually verified that the new integration test fails on maturin's
current `main` branch.
@ngoldbaum

ngoldbaum commented Jun 19, 2026

Copy link
Copy Markdown
ContributorAuthor

Maturin cut a 1.14.1 release so now all that's needed is CFFI.

@ngoldbaum

ngoldbaum commented Jun 19, 2026

Copy link
Copy Markdown
ContributorAuthor

Looks like unconditionally requiring Maturin 1.14.1 or newer works in CI 🥳

I can probably upstream part of this while we wait for CFFI to do a release but for now I think I'll just wait for that before finishing this up.

@alex

alex commented Jun 19, 2026

Copy link
Copy Markdown
Member

The src/rust/cryptography-cffi/build.rs bits look like they could be split out if you wanted.

@ngoldbaumngoldbaum mentioned this pull request Jun 19, 2026
Merged
@ngoldbaumngoldbaum mentioned this pull request Jun 29, 2026
Closed
@xsubxsub mentioned this pull request Jul 5, 2026
Draft
@ngoldbaum
ngoldbaum marked this pull request as ready for review July 6, 2026 22:36
@ngoldbaum

ngoldbaum commented Jul 6, 2026

Copy link
Copy Markdown
ContributorAuthor

@alex I think this is ready now.

@reaperhulk

reaperhulk commented Jul 6, 2026

Copy link
Copy Markdown
Member

This is now a very small PR 😄 What's the next step after merging this?

alex
alex reviewed Jul 6, 2026
View reviewed changes

@alexalex left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Do we need to update version bounds on cffi or anything?

@ngoldbaum

ngoldbaum commented Jul 6, 2026

Copy link
Copy Markdown
ContributorAuthor

Do we need to update version bounds on cffi or anything?

I don't think so. The first CFFI release with Python 3.15 support is CFFI 2.1, which is >= 2.0. 2.0 is fine for older Python versions.

What's the next step after merging this?

Probably worth doing a dry-run of the release automation to verify that you do actually get three wheels per platform out to upload to PyPI. Other than that, I think just a release advertising Python 3.15 support.

@alex

alex commented Jul 6, 2026

Copy link
Copy Markdown
Member

Do we need >=2.1; python_version >= '3.15'?

@ngoldbaum

ngoldbaum commented Jul 6, 2026

Copy link
Copy Markdown
ContributorAuthor

Do we need >=2.1; python_version >= '3.15'?

Sure, let's add that just in case someone does something weird.

alex
alex reviewed Jul 6, 2026
View reviewed changes
Comment threadpyproject.toml Outdated

# Must be kept in sync with `project.dependencies`
"cffi>=2.0.0; platform_python_implementation != 'PyPy'",
"cffi>=2.1; python_version >= '3.15'",

@alexalexJul 6, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ugh, do we need the and platform_python_implementation != 'PyPy' just in case?

@ngoldbaumngoldbaumJul 6, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I'm pretty sure we're safe given the status of Python 3.12 support in PyPy, but let's add it just to cover our bases I guess...

https://github.com/orgs/pypy/discussions/5145

@alex

alex commented Jul 6, 2026

Copy link
Copy Markdown
Member

better safe than sorry 🙃

alex
alex approved these changes Jul 6, 2026
View reviewed changes
@alex
alex merged commit 7547200 into pyca:mainJul 6, 2026
116 checks passed
@mayeutmayeut mentioned this pull request Aug 22, 2026
Open
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alexalexalex approved these changes

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ngoldbaum@alex@reaperhulk