Skip to content

ci: re-enable ffi check on 3.13 for PyConfig, ignore _PyCoLineInstrumentationData #5065

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.

Sign up for GitHub

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

Merged
davidhewitt merged 2 commits into from
Apr 11, 2025
Merged

ci: re-enable ffi check on 3.13 for PyConfig, ignore _PyCoLineInstrumentationData #5065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
781e2ed
ci: re-enable ffi check on 3.13 for PyConfig, ignore `_PyCoLineInstru…
davidhewitt Apr 11, 2025
f74ff23
force 3.13 jobs to use latest 3.13.3
davidhewitt Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ jobs:
with:
python-version: ${{ inputs.python-version }}
architecture: ${{ inputs.python-architecture }}
check-latest: ${{ startsWith(inputs.python-version, 'pypy') }} # PyPy can have FFI changes within Python versions, which creates pain in CI
# PyPy can have FFI changes within Python versions, which creates pain in CI
# 3.13.2 also had an ABI break so temporarily add this for 3.13 to ensure that we're using 3.13.3
check-latest: ${{ startsWith(inputs.python-version, 'pypy') || startsWith(inputs.python-version, '3.13') }}

- name: Install nox
run: python -m pip install --upgrade pip && pip install nox
Expand Down
11 changes: 7 additions & 4 deletions pyo3-ffi-check/macro/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,13 @@ pub fn for_all_structs(input: proc_macro::TokenStream) -> proc_macro::TokenStrea
.strip_suffix(".html")
.unwrap();

if struct_name == "PyConfig" && pyo3_build_config::get().version == PY_3_13 {
// https://github.com/python/cpython/issues/130940
// PyConfig has an ABI break on Python 3.13.1 -> 3.13.2, waiting for advice
// how to proceed in PyO3.
if struct_name == "_PyCoLineInstrumentationData"
&& pyo3_build_config::get().version == PY_3_13
{
// private type, fields changed name in 3.13.2 -> 3.13.3
//
// PyO3 0.25 will remove this struct, ignoring temporarily just to unblock CI
// changed, the size stayed the same.
continue;
}

Expand Down
Loading