diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2021-11-15 13:18:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-15 13:18:53 -0700 |
| commit | 7310c09cb07e11e6ae146957166eac2f17c0729d (patch) | |
| tree | e7788b4c0b32ed738c9cb3819e12619298f7f58d /numpy | |
| parent | a7e22741d058a4c1c8d6b93facbafdf712806614 (diff) | |
| parent | 9c8c88eb68565b80329503f6225b1ee6ebef2356 (diff) | |
| download | numpy-7310c09cb07e11e6ae146957166eac2f17c0729d.tar.gz | |
Merge pull request #20373 from charris/prepare-for-1.22-branch
MAINT: Prepare for branching maintenance/1.22.x
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/code_generators/cversions.txt | 4 | ||||
| -rw-r--r-- | numpy/core/include/numpy/numpyconfig.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt index f0a128d3d..e7b3ef697 100644 --- a/numpy/core/code_generators/cversions.txt +++ b/numpy/core/code_generators/cversions.txt @@ -1,6 +1,8 @@ # Hash below were defined from numpy_api_order.txt and ufunc_api_order.txt # When adding a new version here for a new minor release, also add the same -# version as NPY_x_y_API_VERSION in numpyconfig.h +# version as NPY_x_y_API_VERSION in numpyconfig.h and C_API_VERSION in +# setup_common.py. + 0x00000001 = 603580d224763e58c5e7147f804dc0f5 0x00000002 = 8ecb29306758515ae69749c803a75da1 0x00000003 = bf22c0d05b31625d2a7015988d61ce5a diff --git a/numpy/core/include/numpy/numpyconfig.h b/numpy/core/include/numpy/numpyconfig.h index 1c3686769..f761555b9 100644 --- a/numpy/core/include/numpy/numpyconfig.h +++ b/numpy/core/include/numpy/numpyconfig.h @@ -56,6 +56,6 @@ #define NPY_1_19_API_VERSION 0x00000008 #define NPY_1_20_API_VERSION 0x0000000e #define NPY_1_21_API_VERSION 0x0000000e -#define NPY_1_22_API_VERSION 0x0000000e +#define NPY_1_22_API_VERSION 0x0000000f #endif /* NUMPY_CORE_INCLUDE_NUMPY_NPY_NUMPYCONFIG_H_ */ |