diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2020-05-17 09:55:09 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-17 09:55:09 -0600 |
| commit | b58bbb72ae0e24d7e03fd18f6f3fbdfe95481f8e (patch) | |
| tree | cadcd460f7fd80143b7df13fd37bf2ed45861f28 /numpy/core | |
| parent | bd8be5417632c019dbc1d36400052805f95a372c (diff) | |
| parent | b578312d381ead845e403ae09a3fc7f7ccdaed92 (diff) | |
| download | numpy-b58bbb72ae0e24d7e03fd18f6f3fbdfe95481f8e.tar.gz | |
Merge pull request #16275 from charris/update-after-1.19.x-branch
REL: Update master after 1.19.x branch.
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 |
2 files changed, 2 insertions, 0 deletions
diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt index 5daa52d79..528113a9e 100644 --- a/numpy/core/code_generators/cversions.txt +++ b/numpy/core/code_generators/cversions.txt @@ -50,4 +50,5 @@ # 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 diff --git a/numpy/core/include/numpy/numpyconfig.h b/numpy/core/include/numpy/numpyconfig.h index 4df4ea438..8eaf446b7 100644 --- a/numpy/core/include/numpy/numpyconfig.h +++ b/numpy/core/include/numpy/numpyconfig.h @@ -41,5 +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 #endif |