From c316cf36204e447856b44092a0e4616705e62393 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Wed, 12 Feb 2025 15:05:58 -0800 Subject: [PATCH] Make PYBIND11_INTERNALS_VERSION 6 the default on all platforms. (#5512) --- include/pybind11/detail/internals.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/include/pybind11/detail/internals.h b/include/pybind11/detail/internals.h index 5fcaf9b9c..13f82d030 100644 --- a/include/pybind11/detail/internals.h +++ b/include/pybind11/detail/internals.h @@ -37,22 +37,14 @@ /// further ABI-incompatible changes may be made before the ABI is officially /// changed to the new version. #ifndef PYBIND11_INTERNALS_VERSION -# if PY_VERSION_HEX >= 0x030C0000 || defined(_MSC_VER) -// Version bump for Python 3.12+, before first 3.12 beta release. -// Version bump for MSVC piggy-backed on PR #4779. See comments there. -# ifdef Py_GIL_DISABLED -# define PYBIND11_INTERNALS_VERSION 6 -# else -# define PYBIND11_INTERNALS_VERSION 5 -# endif -# else -# define PYBIND11_INTERNALS_VERSION 4 -# endif +# define PYBIND11_INTERNALS_VERSION 6 #endif // This requirement is mainly to reduce the support burden (see PR #4570). static_assert(PY_VERSION_HEX < 0x030C0000 || PYBIND11_INTERNALS_VERSION >= 5, "pybind11 ABI version 5 is the minimum for Python 3.12+"); +static_assert(PYBIND11_INTERNALS_VERSION >= 4, + "pybind11 ABI version 4 is the minimum for all platforms."); PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)