diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2019-12-03 16:45:09 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2019-12-03 17:53:41 -0700 |
| commit | fbcb58ca2c17217f5dc85cb669ea651b7799b60c (patch) | |
| tree | ca3354b604387d1b0b9dca307c84f59cb3e3fbf4 /numpy/core | |
| parent | fdd8395f21a252373ff17fd43185c42e040c1b64 (diff) | |
| download | numpy-fbcb58ca2c17217f5dc85cb669ea651b7799b60c.tar.gz | |
REL: Update master after 1.18.x branch.
Apart from the usual modifications, this
- Removes a release note snippet added after towncrier was run
- Removes testing on Python 3.5 as it is dropped for 1.19.x.
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 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 |