Skip to content

Commit 18b72c0

Browse files
committed
Tie PYBIND11_INTERNALS_VERSION 6 to PYBIND11_VERSION_MAJOR >= 3
1 parent 89d0ddd commit 18b72c0

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

include/pybind11/detail/common.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99

1010
#pragma once
1111

12-
#define PYBIND11_VERSION_MAJOR 2
13-
#define PYBIND11_VERSION_MINOR 14
12+
#define PYBIND11_VERSION_MAJOR 3
13+
#define PYBIND11_VERSION_MINOR 0
1414
#define PYBIND11_VERSION_PATCH 0.dev1
1515

1616
// Similar to Python's convention: https://docs.python.org/3/c-api/apiabiversion.html
1717
// Additional convention: 0xD = dev
18-
#define PYBIND11_VERSION_HEX 0x020E00D1
18+
#define PYBIND11_VERSION_HEX 0x030000D1
1919

2020
// Define some generic pybind11 helper macros for warning management.
2121
//

include/pybind11/detail/internals.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,14 @@
3636
/// further ABI-incompatible changes may be made before the ABI is officially
3737
/// changed to the new version.
3838
#ifndef PYBIND11_INTERNALS_VERSION
39-
# if PY_VERSION_HEX >= 0x030C0000 || defined(_MSC_VER)
39+
# if PYBIND11_VERSION_MAJOR >= 3
40+
# define PYBIND11_INTERNALS_VERSION 6
41+
# elif PY_VERSION_HEX >= 0x030C0000 || defined(_MSC_VER)
4042
// Version bump for Python 3.12+, before first 3.12 beta release.
4143
// Version bump for MSVC piggy-backed on PR #4779. See comments there.
42-
# define PYBIND11_INTERNALS_VERSION 6 // BAKEIN_WIP: Only do this for pybind11 v3.0.0
44+
# define PYBIND11_INTERNALS_VERSION 5
4345
# else
44-
# define PYBIND11_INTERNALS_VERSION 6 // BAKEIN_WIP: Only do this for pybind11 v3.0.0
46+
# define PYBIND11_INTERNALS_VERSION 4
4547
# endif
4648
#endif
4749

pybind11/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ def _to_int(s: str) -> int | str:
88
return s
99

1010

11-
__version__ = "2.14.0.dev1"
11+
__version__ = "3.0.0.dev1"
1212
version_info = tuple(_to_int(s) for s in __version__.split("."))

0 commit comments

Comments
 (0)