diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2021-05-22 20:15:17 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-22 20:15:17 -0600 |
| commit | b283e16320d962517381ec2202bb55d785b33e8c (patch) | |
| tree | f200a60225dd1a60d9d969d6cab776d4817eec2c /numpy/core | |
| parent | 7aeb763c0cb7b2ada635e9e97b7b3b416f994a8c (diff) | |
| parent | dc323b1c8b5e570dcce8926246127ead719cf52a (diff) | |
| download | numpy-b283e16320d962517381ec2202bb55d785b33e8c.tar.gz | |
Merge pull request #19070 from charris/prepare-main-for-1.22.0.dev0
REL: Prepare for NumPy 1.22.0 development
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/code_generators/cversions.txt | 2 | ||||
| -rw-r--r-- | numpy/core/include/numpy/numpyconfig.h | 1 | ||||
| -rw-r--r-- | numpy/core/setup_common.py | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt index 2d3a65391..a02c7153a 100644 --- a/numpy/core/code_generators/cversions.txt +++ b/numpy/core/code_generators/cversions.txt @@ -55,4 +55,6 @@ # Version 14 (NumPy 1.20) # DType related API additions. # A new field was added to the end of PyArrayObject_fields. +# Version 14 (NumPy 1.21) No change. +# Version 14 (NumPy 1.22) No change. 0x0000000e = 17a0f366e55ec05e5c5c149123478452 diff --git a/numpy/core/include/numpy/numpyconfig.h b/numpy/core/include/numpy/numpyconfig.h index a1b1de0ef..726f1dfac 100644 --- a/numpy/core/include/numpy/numpyconfig.h +++ b/numpy/core/include/numpy/numpyconfig.h @@ -43,5 +43,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 #endif diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py index fe66bd173..85c8f16d1 100644 --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -42,6 +42,8 @@ C_ABI_VERSION = 0x01000009 # 0x0000000d - 1.16.x # 0x0000000d - 1.19.x # 0x0000000e - 1.20.x +# 0x0000000e - 1.21.x +# 0x0000000e - 1.22.x C_API_VERSION = 0x0000000e class MismatchCAPIWarning(Warning): |