diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2019-12-03 18:06:17 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-03 18:06:17 -0800 |
commit | 766eb34aaad10bbd2ead50e4aef438192fe87ad4 (patch) | |
tree | ca3354b604387d1b0b9dca307c84f59cb3e3fbf4 /numpy | |
parent | fdd8395f21a252373ff17fd43185c42e040c1b64 (diff) | |
parent | fbcb58ca2c17217f5dc85cb669ea651b7799b60c (diff) | |
download | numpy-766eb34aaad10bbd2ead50e4aef438192fe87ad4.tar.gz |
Merge pull request #15042 from charris/post-1.18.x-branch-update
REL: Update master after 1.18.x branch.
Diffstat (limited to 'numpy')
-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 72d2af8b9..5daa52d79 100644 --- a/numpy/core/code_generators/cversions.txt +++ b/numpy/core/code_generators/cversions.txt @@ -49,4 +49,5 @@ # Add PyUFunc_FromFuncAndDataAndSignatureAndIdentity to ufunc_funcs_api. # Version 13 (NumPy 1.17) No change. # Version 13 (NumPy 1.18) No change. +# Version 13 (NumPy 1.19) No change. 0x0000000d = 5b0e8bbded00b166125974fc71e80a33 diff --git a/numpy/core/include/numpy/numpyconfig.h b/numpy/core/include/numpy/numpyconfig.h index 4bca82f9f..4df4ea438 100644 --- a/numpy/core/include/numpy/numpyconfig.h +++ b/numpy/core/include/numpy/numpyconfig.h @@ -40,5 +40,6 @@ #define NPY_1_16_API_VERSION 0x00000008 #define NPY_1_17_API_VERSION 0x00000008 #define NPY_1_18_API_VERSION 0x00000008 +#define NPY_1_19_API_VERSION 0x00000008 #endif |