Skip to content

Commit 93b6447

Browse files
authored
Merge pull request numpy#28121 from seberg/c-api-version
MAINT: Correct NumPy 2.3 C-API versioning and version information
2 parents af103b2 + 270408a commit 93b6447

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

numpy/_core/code_generators/cversions.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,6 @@
7777
0x00000012 = 2b8f1f4da822491ff030b2b37dff07e3
7878
# Version 19 (NumPy 2.1.0) Only header additions
7979
# Version 19 (NumPy 2.2.0) No change
80+
0x00000013 = 2b8f1f4da822491ff030b2b37dff07e3
8081
# Version 19 (NumPy 2.3.0)
81-
0x00000013 = e56b74d32a934d085e7c3414cb9999b8,
82+
0x00000014 = e56b74d32a934d085e7c3414cb9999b8,

numpy/_core/include/numpy/numpyconfig.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
#define NPY_2_0_API_VERSION 0x00000012
8484
#define NPY_2_1_API_VERSION 0x00000013
8585
#define NPY_2_2_API_VERSION 0x00000013
86-
#define NPY_2_3_API_VERSION 0x00000013
86+
#define NPY_2_3_API_VERSION 0x00000014
8787

8888

8989
/*
@@ -172,6 +172,8 @@
172172
#define NPY_FEATURE_VERSION_STRING "2.0"
173173
#elif NPY_FEATURE_VERSION == NPY_2_1_API_VERSION
174174
#define NPY_FEATURE_VERSION_STRING "2.1"
175+
#elif NPY_FEATURE_VERSION == NPY_2_3_API_VERSION
176+
#define NPY_FEATURE_VERSION_STRING "2.3"
175177
#else
176178
#error "Missing version string define for new NumPy version."
177179
#endif

numpy/_core/meson.build

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ C_ABI_VERSION = '0x02000000'
4848
# 0x00000011 - 1.25.x
4949
# 0x00000012 - 2.0.x
5050
# 0x00000013 - 2.1.x
51-
C_API_VERSION = '0x00000013'
51+
# 0x00000013 - 2.2.x
52+
# 0x00000014 - 2.3.x
53+
C_API_VERSION = '0x00000014'
5254

5355
# Check whether we have a mismatch between the set C API VERSION and the
5456
# actual C API VERSION. Will raise a MismatchCAPIError if so.

0 commit comments

Comments
 (0)