diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2017-05-10 11:01:08 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2017-05-10 11:01:08 -0600 |
| commit | a3afc25089b5343b2dc7ea21add26d03fc232539 (patch) | |
| tree | c9d103aad79c1f19404e1aadffcf61650ffaa211 /numpy | |
| parent | 14ff219a13e194c5e7995218fea3c7648eb1c875 (diff) | |
| download | numpy-a3afc25089b5343b2dc7ea21add26d03fc232539.tar.gz | |
MAINT: Update master branch for 1.14.0 development.
Post 1.13.x branch housekeeping.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/code_generators/cversions.txt | 1 | ||||
| -rw-r--r-- | numpy/core/include/numpy/numpyconfig.h | 2 | ||||
| -rw-r--r-- | numpy/core/setup_common.py | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt index 54140f24a..6e6547129 100644 --- a/numpy/core/code_generators/cversions.txt +++ b/numpy/core/code_generators/cversions.txt @@ -36,4 +36,5 @@ 0x0000000a = 9b8bce614655d3eb02acddcb508203cb # Version 11 (NumPy 1.13) Added PyArray_MapIterArrayCopyIfOverlap +# Version 11 (NumPy 1.14) No Change 0x0000000b = edb1ba83730c650fd9bc5772a919cda7 diff --git a/numpy/core/include/numpy/numpyconfig.h b/numpy/core/include/numpy/numpyconfig.h index 701f02c6e..04a3738b9 100644 --- a/numpy/core/include/numpy/numpyconfig.h +++ b/numpy/core/include/numpy/numpyconfig.h @@ -34,5 +34,7 @@ #define NPY_1_10_API_VERSION 0x00000008 #define NPY_1_11_API_VERSION 0x00000008 #define NPY_1_12_API_VERSION 0x00000008 +#define NPY_1_13_API_VERSION 0x00000008 +#define NPY_1_14_API_VERSION 0x00000008 #endif diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py index 1b3984063..094cd1841 100644 --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -39,6 +39,7 @@ C_ABI_VERSION = 0x01000009 # 0x0000000a - 1.11.x # 0x0000000a - 1.12.x # 0x0000000b - 1.13.x +# 0x0000000b - 1.14.x C_API_VERSION = 0x0000000b class MismatchCAPIWarning(Warning): |