diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2017-11-14 09:14:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-14 09:14:36 -0700 |
| commit | abbf4155a0b068520138245b67c34a034a52c42a (patch) | |
| tree | fc58d0a560639773f7400c1e4b42956756ba1354 | |
| parent | 26dd6b8dfcccd0435ff31ce01ca7da4797ce9a4d (diff) | |
| parent | 9ef80bfa25648b9a51adaf598c0f2738cb6b5064 (diff) | |
| download | numpy-abbf4155a0b068520138245b67c34a034a52c42a.tar.gz | |
Merge pull request #10022 from charris/update-c-api
MAINT: Update c-api version and hash for NumPy 1.14.
| -rw-r--r-- | numpy/core/code_generators/cversions.txt | 6 | ||||
| -rw-r--r-- | numpy/core/setup_common.py | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt index b603b6df8..68ac5109c 100644 --- a/numpy/core/code_generators/cversions.txt +++ b/numpy/core/code_generators/cversions.txt @@ -36,6 +36,8 @@ 0x0000000a = 9b8bce614655d3eb02acddcb508203cb # Version 11 (NumPy 1.13) Added PyArray_MapIterArrayCopyIfOverlap -# Version 11 (NumPy 1.14) Added PyArray_ResolveWritebackIfCopy, -# PyArray_SetWritebackIfCopyBase and deprecate PyArray_SetUpdateIfCopyBase. 0x0000000b = edb1ba83730c650fd9bc5772a919cda7 + +# Version 12 (NumPy 1.14) Added PyArray_ResolveWritebackIfCopy, +# PyArray_SetWritebackIfCopyBase and deprecated PyArray_SetUpdateIfCopyBase. +0x0000000c = a1bc756c5782853ec2e3616cf66869d8 diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py index 094cd1841..97608d18a 100644 --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -39,8 +39,8 @@ C_ABI_VERSION = 0x01000009 # 0x0000000a - 1.11.x # 0x0000000a - 1.12.x # 0x0000000b - 1.13.x -# 0x0000000b - 1.14.x -C_API_VERSION = 0x0000000b +# 0x0000000c - 1.14.x +C_API_VERSION = 0x0000000c class MismatchCAPIWarning(Warning): pass |