From d92792f8adc83750e172eabcf8feb61769b6fbf3 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 | 3 ++- newsfragments/3687.added.md | 1 + pyo3-build-config/Cargo.toml | 3 ++- pyo3-build-config/src/impl_.rs | 2 +- pyo3-ffi/Cargo.toml | 3 ++- 5 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 newsfragments/3687.added.md diff --git a/Cargo.toml b/Cargo.toml index 3d25f578..69d26085 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -87,7 +87,8 @@ abi3-py37 = ["abi3-py38", "pyo3-build-config/abi3-py37", "pyo3-ffi/abi3-py37"] 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-py311 = ["abi3-py312", "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 00000000..a6df28d9 --- /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 d7dd8747..702e99a4 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 ec05d7dc..e188767f 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 636230f2..bc40d86c 100644 --- a/pyo3-ffi/Cargo.toml +++ b/pyo3-ffi/Cargo.toml @@ -31,7 +31,8 @@ abi3-py37 = ["abi3-py38", "pyo3-build-config/abi3-py37"] 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-py311 = ["abi3-py312", "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"]