Skip to content

Update FFI wrappers for PyModExport and PyABIInfo APIs #5746

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 13 commits into from
Jan 26, 2026
Merged

Update FFI wrappers for PyModExport and PyABIInfo APIs #5746

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a1694a3
add wrappers for the PEP 793 PyModSupport API
ngoldbaum Jan 19, 2026
b1d7101
add wrappers for the PyABIInfo API
ngoldbaum Jan 19, 2026
0103458
Fix error in PyModuleDef_Base definition
ngoldbaum Jan 19, 2026
5fa2807
add changelog entry
ngoldbaum Jan 19, 2026
eb86973
expose PyABIInfo_VAR
ngoldbaum Jan 19, 2026
f3c8778
use the new APIs in the pyo3-ffi examples
ngoldbaum Jan 19, 2026
96c90d9
fix python < 3.15 conditional compilation
ngoldbaum Jan 19, 2026
a3c01fa
update code in pyo3-ffi README
ngoldbaum Jan 19, 2026
49b2033
fix issues caught during windowd 3.15t tests
ngoldbaum Jan 19, 2026
ad29df8
Update more out-of-date copies of string_sum sources
ngoldbaum Jan 19, 2026
bd41b5b
code golf the number of slots
ngoldbaum Jan 19, 2026
2358c16
Revert incorrect change to m_init type and add comments
ngoldbaum Jan 23, 2026
1ec713d
Fix typo in release note fragment
ngoldbaum Jan 23, 2026
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
Prev Previous commit
Next Next commit
code golf the number of slots
  • Loading branch information
@ngoldbaum
ngoldbaum committed Jan 23, 2026
commit bd41b5b802d52f06120e857a83258b00dabd6f3d
6 changes: 2 additions & 4 deletions pyo3-ffi/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,8 @@ static mut METHODS: [PyMethodDef; 2] = [
#[cfg(Py_3_15)]
PyABIInfo_VAR!(ABI_INFO);

const SLOTS_LEN: usize = 1
+ if cfg!(Py_3_12) { 1 } else { 0 }
+ if cfg!(Py_GIL_DISABLED) { 1 } else { 0 }
+ if cfg!(Py_3_15) { 4 } else { 0 };
const SLOTS_LEN: usize =
1 + cfg!(Py_3_12) as usize + cfg!(Py_GIL_DISABLED) as usize + 4 * (cfg!(Py_3_15) as usize);
static mut SLOTS: [PyModuleDef_Slot; SLOTS_LEN] = [
#[cfg(Py_3_15)]
PyModuleDef_Slot {
Expand Down
6 changes: 2 additions & 4 deletions pyo3-ffi/examples/sequential/src/module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ pub static mut MODULE_DEF: PyModuleDef = PyModuleDef {
#[cfg(Py_3_15)]
PyABIInfo_VAR!(ABI_INFO);

const SEQUENTIAL_SLOTS_LEN: usize = 2
+ if cfg!(Py_3_12) { 1 } else { 0 }
+ if cfg!(Py_GIL_DISABLED) { 1 } else { 0 }
+ if cfg!(Py_3_15) { 7 } else { 0 };
const SEQUENTIAL_SLOTS_LEN: usize =
2 + cfg!(Py_3_12) as usize + cfg!(Py_GIL_DISABLED) as usize + 7 * (cfg!(Py_3_15) as usize);
pub static mut SEQUENTIAL_SLOTS: [PyModuleDef_Slot; SEQUENTIAL_SLOTS_LEN] = [
#[cfg(Py_3_15)]
PyModuleDef_Slot {
Expand Down
6 changes: 2 additions & 4 deletions pyo3-ffi/examples/string-sum/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,8 @@ static mut METHODS: [PyMethodDef; 2] = [
#[cfg(Py_3_15)]
PyABIInfo_VAR!(ABI_INFO);

const SLOTS_LEN: usize = 1
+ if cfg!(Py_3_12) { 1 } else { 0 }
+ if cfg!(Py_GIL_DISABLED) { 1 } else { 0 }
+ if cfg!(Py_3_15) { 4 } else { 0 };
const SLOTS_LEN: usize =
1 + cfg!(Py_3_12) as usize + cfg!(Py_GIL_DISABLED) as usize + 4 * (cfg!(Py_3_15) as usize);
static mut SLOTS: [PyModuleDef_Slot; SLOTS_LEN] = [
#[cfg(Py_3_15)]
PyModuleDef_Slot {
Expand Down
6 changes: 2 additions & 4 deletions pyo3-ffi/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,8 @@
//! #[cfg(Py_3_15)]
//! PyABIInfo_VAR!(ABI_INFO);
//!
//! const SLOTS_LEN: usize = 1
//! + if cfg!(Py_3_12) { 1 } else { 0 }
//! + if cfg!(Py_GIL_DISABLED) { 1 } else { 0 }
//! + if cfg!(Py_3_15) { 4 } else { 0 };
//! const SLOTS_LEN: usize =
//! 1 + cfg!(Py_3_12) as usize + cfg!(Py_GIL_DISABLED) as usize + 4 * (cfg!(Py_3_15) as usize);
//! static mut SLOTS: [PyModuleDef_Slot; SLOTS_LEN] = [
//! #[cfg(Py_3_15)]
//! PyModuleDef_Slot {
Expand Down