diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2021-11-16 17:07:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-16 17:07:06 -0700 |
| commit | a1b5d443c375f9b63a415027da66f3d729cd59b5 (patch) | |
| tree | 9f6491d2f335ac6aa86b013fbfcaab56e72a8dc9 /numpy/core | |
| parent | 640fff6b33eb092319160b300b80bbbe3669cd35 (diff) | |
| parent | fdf884efb9418a7088aef291ffa47ce8c709a8cb (diff) | |
| download | numpy-a1b5d443c375f9b63a415027da66f3d729cd59b5.tar.gz | |
Merge pull request #20387 from charris/prepare-main-for-1.23.0-development
REL: Prepare main for NumPy 1.23.0 development
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/code_generators/cversions.txt | 1 | ||||
| -rw-r--r-- | numpy/core/include/numpy/numpyconfig.h | 1 | ||||
| -rw-r--r-- | numpy/core/setup_common.py | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt index e7b3ef697..e1ee8a860 100644 --- a/numpy/core/code_generators/cversions.txt +++ b/numpy/core/code_generators/cversions.txt @@ -61,4 +61,5 @@ 0x0000000e = 17a0f366e55ec05e5c5c149123478452 # Version 15 (NumPy 1.22) Configurable memory allocations +# Version 14 (NumPy 1.23) No change. 0x0000000f = b8783365b873681cd204be50cdfb448d diff --git a/numpy/core/include/numpy/numpyconfig.h b/numpy/core/include/numpy/numpyconfig.h index f761555b9..4eac083e7 100644 --- a/numpy/core/include/numpy/numpyconfig.h +++ b/numpy/core/include/numpy/numpyconfig.h @@ -57,5 +57,6 @@ #define NPY_1_20_API_VERSION 0x0000000e #define NPY_1_21_API_VERSION 0x0000000e #define NPY_1_22_API_VERSION 0x0000000f +#define NPY_1_23_API_VERSION 0x0000000f #endif /* NUMPY_CORE_INCLUDE_NUMPY_NPY_NUMPYCONFIG_H_ */ diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py index 70e8fc897..772c87c96 100644 --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -44,6 +44,7 @@ C_ABI_VERSION = 0x01000009 # 0x0000000e - 1.20.x # 0x0000000e - 1.21.x # 0x0000000f - 1.22.x +# 0x0000000f - 1.23.x C_API_VERSION = 0x0000000f class MismatchCAPIWarning(Warning): |