From f44d87dae35f0848552511c632ee2263e37a08e4 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Thu, 21 Dec 2023 10:29:00 -0500 Subject: [PATCH] Fixes #3645 -- added `abi3-py312` feature --- Cargo.toml | 1 + newsfragments/3687.added.md | 1 + pyo3-build-config/Cargo.toml | 3 ++- pyo3-build-config/src/impl_.rs | 2 +- pyo3-ffi/Cargo.toml | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 newsfragments/3687.added.md diff --git a/Cargo.toml b/Cargo.toml index 3d25f578d76..fa811e22acf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -88,6 +88,7 @@ abi3-py38 = ["abi3-py39", "pyo3-build-config/abi3-py38", "pyo3-ffi/abi3-py38"] abi3-py39 = ["abi3-py310", "pyo3-build-config/abi3-py39", "pyo3-ffi/abi3-py39"] abi3-py310 = ["abi3-py311", "pyo3-build-config/abi3-py310", "pyo3-ffi/abi3-py310"] abi3-py311 = ["abi3", "pyo3-build-config/abi3-py311", "pyo3-ffi/abi3-py311"] +abi3-py312 = ["abi3", "pyo3-build-config/abi3-py312", "pyo3-ffi/abi3-py312"] # Automatically generates `python3.dll` import libraries for Windows targets. generate-import-lib = ["pyo3-ffi/generate-import-lib"] diff --git a/newsfragments/3687.added.md b/newsfragments/3687.added.md new file mode 100644 index 00000000000..a6df28d939f --- /dev/null +++ b/newsfragments/3687.added.md @@ -0,0 +1 @@ +Added `abi3-py312` feature diff --git a/pyo3-build-config/Cargo.toml b/pyo3-build-config/Cargo.toml index d7dd8747953..702e99a4aac 100644 --- a/pyo3-build-config/Cargo.toml +++ b/pyo3-build-config/Cargo.toml @@ -35,7 +35,8 @@ abi3-py37 = ["abi3-py38"] abi3-py38 = ["abi3-py39"] abi3-py39 = ["abi3-py310"] abi3-py310 = ["abi3-py311"] -abi3-py311 = ["abi3"] +abi3-py311 = ["abi3-py312"] +abi3-py312 = ["abi3"] [package.metadata.docs.rs] features = ["resolve-config"] diff --git a/pyo3-build-config/src/impl_.rs b/pyo3-build-config/src/impl_.rs index ec05d7dc956..e188767fcd1 100644 --- a/pyo3-build-config/src/impl_.rs +++ b/pyo3-build-config/src/impl_.rs @@ -34,7 +34,7 @@ use crate::{ const MINIMUM_SUPPORTED_VERSION: PythonVersion = PythonVersion { major: 3, minor: 7 }; /// Maximum Python version that can be used as minimum required Python version with abi3. -const ABI3_MAX_MINOR: u8 = 11; +const ABI3_MAX_MINOR: u8 = 12; /// Gets an environment variable owned by cargo. /// diff --git a/pyo3-ffi/Cargo.toml b/pyo3-ffi/Cargo.toml index 636230f26f9..c6fe69e9cea 100644 --- a/pyo3-ffi/Cargo.toml +++ b/pyo3-ffi/Cargo.toml @@ -32,6 +32,7 @@ abi3-py38 = ["abi3-py39", "pyo3-build-config/abi3-py38"] abi3-py39 = ["abi3-py310", "pyo3-build-config/abi3-py39"] abi3-py310 = ["abi3-py311", "pyo3-build-config/abi3-py310"] abi3-py311 = ["abi3", "pyo3-build-config/abi3-py311"] +abi3-py312 = ["abi3", "pyo3-build-config/abi3-py312"] # Automatically generates `python3.dll` import libraries for Windows targets. generate-import-lib = ["pyo3-build-config/python3-dll-a"]