diff options
author | Ralf Gommers <ralf.gommers@gmail.com> | 2019-12-02 19:38:05 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-02 19:38:05 -0800 |
commit | 7999f7c038a50d79b06edf2d45eb5ff2c25a5a42 (patch) | |
tree | 2a75919cf2eb9969b8ead0e0b3ca2f8ce1a0b907 /numpy | |
parent | dc94b2f0f8618f11c045f361859b8c0a3314a40b (diff) | |
parent | 0539aa4a0d24485cf3fa315a42085e16d8589523 (diff) | |
download | numpy-7999f7c038a50d79b06edf2d45eb5ff2c25a5a42.tar.gz |
Merge pull request #15031 from charris/prepare-1.18-branch
REL: Prepare for 1.18 branch
Diffstat (limited to 'numpy')
-rw-r--r-- | numpy/core/code_generators/cversions.txt | 2 | ||||
-rw-r--r-- | numpy/core/include/numpy/numpyconfig.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt index 00f10df57..72d2af8b9 100644 --- a/numpy/core/code_generators/cversions.txt +++ b/numpy/core/code_generators/cversions.txt @@ -47,4 +47,6 @@ # Deprecate PyArray_SetNumericOps and PyArray_GetNumericOps, # Add fields core_dim_flags and core_dim_sizes to PyUFuncObject. # Add PyUFunc_FromFuncAndDataAndSignatureAndIdentity to ufunc_funcs_api. +# Version 13 (NumPy 1.17) No change. +# Version 13 (NumPy 1.18) No change. 0x0000000d = 5b0e8bbded00b166125974fc71e80a33 diff --git a/numpy/core/include/numpy/numpyconfig.h b/numpy/core/include/numpy/numpyconfig.h index ab198f36b..4bca82f9f 100644 --- a/numpy/core/include/numpy/numpyconfig.h +++ b/numpy/core/include/numpy/numpyconfig.h @@ -37,5 +37,8 @@ #define NPY_1_13_API_VERSION 0x00000008 #define NPY_1_14_API_VERSION 0x00000008 #define NPY_1_15_API_VERSION 0x00000008 +#define NPY_1_16_API_VERSION 0x00000008 +#define NPY_1_17_API_VERSION 0x00000008 +#define NPY_1_18_API_VERSION 0x00000008 #endif |