diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2016-11-05 12:32:33 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2016-11-05 12:32:33 -0600 |
| commit | 28e39059622fdfa4e5d454564afa77fc9468768b (patch) | |
| tree | 569c10a7e3a8ee60641b9f80974105efd040d31b | |
| parent | 2272c32d90026cc07af9c8bca3c2a33feb1e788a (diff) | |
| download | numpy-28e39059622fdfa4e5d454564afa77fc9468768b.tar.gz | |
REL: Updates for C-ABI and C-API.
No changes in the interfaces but some housekeeping is needed.
- Add comments to cversions.txt and setup_common.py
- Add NPY_1_12_API_VERSION to numpyconfig.h
[ci skip]
| -rw-r--r-- | numpy/core/code_generators/cversions.txt | 1 | ||||
| -rw-r--r-- | numpy/core/include/numpy/numpyconfig.h | 1 | ||||
| -rw-r--r-- | numpy/core/setup_common.py | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt index 47781add8..9ade153f5 100644 --- a/numpy/core/code_generators/cversions.txt +++ b/numpy/core/code_generators/cversions.txt @@ -32,4 +32,5 @@ # Version 10 (NumPy 1.10) Added PyArray_CheckAnyScalarExact # Version 10 (NumPy 1.11) No change. +# Version 10 (NumPy 1.12) No change. 0x0000000a = 9b8bce614655d3eb02acddcb508203cb diff --git a/numpy/core/include/numpy/numpyconfig.h b/numpy/core/include/numpy/numpyconfig.h index 71ced6e07..701f02c6e 100644 --- a/numpy/core/include/numpy/numpyconfig.h +++ b/numpy/core/include/numpy/numpyconfig.h @@ -33,5 +33,6 @@ #define NPY_1_9_API_VERSION 0x00000008 #define NPY_1_10_API_VERSION 0x00000008 #define NPY_1_11_API_VERSION 0x00000008 +#define NPY_1_12_API_VERSION 0x00000008 #endif diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py index a97b02645..d9e9ba5df 100644 --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -37,6 +37,7 @@ C_ABI_VERSION = 0x01000009 # 0x00000009 - 1.9.x # 0x0000000a - 1.10.x # 0x0000000a - 1.11.x +# 0x0000000a - 1.12.x C_API_VERSION = 0x0000000a class MismatchCAPIWarning(Warning): |