diff options
| author | Ralf Gommers <ralf.gommers@googlemail.com> | 2015-06-22 21:09:42 +0200 |
|---|---|---|
| committer | Ralf Gommers <ralf.gommers@googlemail.com> | 2015-06-22 21:09:42 +0200 |
| commit | 81c2c16f3218c879f5bfeacd80f237336e56584d (patch) | |
| tree | 0f07ae5af9267530386924b707749ed07c29b0fa /numpy | |
| parent | 10c9091ad8ca3b44e4fb03656e14091a3d9cf763 (diff) | |
| parent | 39b7b08c781d707eedbd7f7dfe2e7c8af614c16d (diff) | |
| download | numpy-81c2c16f3218c879f5bfeacd80f237336e56584d.tar.gz | |
Merge pull request #5998 from charris/update-version-hash
MAINT: Update version info for Numpy 1.10.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/code_generators/cversions.txt | 3 | ||||
| -rw-r--r-- | numpy/core/include/numpy/numpyconfig.h | 1 | ||||
| -rw-r--r-- | numpy/core/setup_common.py | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt index acfced812..dea6d0ecf 100644 --- a/numpy/core/code_generators/cversions.txt +++ b/numpy/core/code_generators/cversions.txt @@ -29,3 +29,6 @@ # The interface has not changed, but the hash is different due to # the annotations, so keep the previous version number. 0x00000009 = 982c4ebb6e7e4c194bf46b1535b4ef1b + +# Version 10 (NumPy 1.10) Added PyArray_CheckAnyScalarExact +0x0000000a = 9b8bce614655d3eb02acddcb508203cb diff --git a/numpy/core/include/numpy/numpyconfig.h b/numpy/core/include/numpy/numpyconfig.h index 9d6dce004..20e15d624 100644 --- a/numpy/core/include/numpy/numpyconfig.h +++ b/numpy/core/include/numpy/numpyconfig.h @@ -31,5 +31,6 @@ #define NPY_1_7_API_VERSION 0x00000007 #define NPY_1_8_API_VERSION 0x00000008 #define NPY_1_9_API_VERSION 0x00000008 +#define NPY_1_10_API_VERSION 0x00000008 #endif diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py index 6abbe5ff2..09e6b1595 100644 --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -35,7 +35,8 @@ C_ABI_VERSION = 0x01000009 # 0x00000008 - 1.7.x # 0x00000009 - 1.8.x # 0x00000009 - 1.9.x -C_API_VERSION = 0x00000009 +# 0x0000000a - 1.10.x +C_API_VERSION = 0x0000000a class MismatchCAPIWarning(Warning): pass |