diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2020-11-27 07:43:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-27 07:43:18 -0700 |
| commit | 4635c9966f9f9a1bbb775fafc4096fddee8160dd (patch) | |
| tree | 4472ccd9c535dd9333bfc16e636e801ada2ed48d /numpy | |
| parent | b66d03dfc4958d159c5dc3ddc9075f8bcc47f9c5 (diff) | |
| parent | 70477a5bb8067d67cce5608c685249cfe7606881 (diff) | |
| download | numpy-4635c9966f9f9a1bbb775fafc4096fddee8160dd.tar.gz | |
Merge pull request #17857 from charris/prepare-1.20-branch
MAINT: Prepare for the NumPy 1.20.x branch.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/code_generators/cversions.txt | 5 | ||||
| -rw-r--r-- | numpy/core/include/numpy/numpyconfig.h | 2 | ||||
| -rw-r--r-- | numpy/core/setup_common.py | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt index 1868610f4..2d3a65391 100644 --- a/numpy/core/code_generators/cversions.txt +++ b/numpy/core/code_generators/cversions.txt @@ -50,8 +50,9 @@ # Version 13 (NumPy 1.17) No change. # Version 13 (NumPy 1.18) No change. # Version 13 (NumPy 1.19) No change. -# Version 13 (NumPy 1.20) No change. 0x0000000d = 5b0e8bbded00b166125974fc71e80a33 -# Version 14 (NumPy 1.19) DType related API additions +# Version 14 (NumPy 1.20) +# DType related API additions. +# A new field was added to the end of PyArrayObject_fields. 0x0000000e = 17a0f366e55ec05e5c5c149123478452 diff --git a/numpy/core/include/numpy/numpyconfig.h b/numpy/core/include/numpy/numpyconfig.h index 8eaf446b7..e39303123 100644 --- a/numpy/core/include/numpy/numpyconfig.h +++ b/numpy/core/include/numpy/numpyconfig.h @@ -41,6 +41,6 @@ #define NPY_1_17_API_VERSION 0x00000008 #define NPY_1_18_API_VERSION 0x00000008 #define NPY_1_19_API_VERSION 0x00000008 -#define NPY_1_20_API_VERSION 0x00000008 +#define NPY_1_20_API_VERSION 0x0000000e #endif diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py index f15425c87..ba3e215b3 100644 --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -40,7 +40,8 @@ C_ABI_VERSION = 0x01000009 # 0x0000000c - 1.14.x # 0x0000000c - 1.15.x # 0x0000000d - 1.16.x -# 0x0000000e - 1.19.x +# 0x0000000d - 1.19.x +# 0x0000000e - 1.20.x C_API_VERSION = 0x0000000e class MismatchCAPIWarning(Warning): |