Merge pull request #5998 from charris/update-version-hash

MAINT: Update version info for Numpy 1.10.

4 files changed, 15 insertions, 10 deletions

diff --git a/doc/HOWTO_RELEASE.rst.txt b/doc/HOWTO_RELEASE.rst.txt
index 61bf71da0..cde342a74 100644
--- a/doc/HOWTO_RELEASE.rst.txt
+++ b/doc/HOWTO_RELEASE.rst.txt
@@ -259,15 +259,15 @@ There are three steps to the process.
    not backward compatible.
 
 2. If the C_API_VERSION in the first step has changed, or if the hash of
-   the API has changed, the cversions.txt file needs to be updated. To
-   check the hash, run the script numpy/core/cversions.py and note the api hash
-   that is printed. If that hash does not match the last hash in cversions.txt
-   the hash has changed. Using both the appropriate C_API_VERSION and hash,
-   add a new entry to cversions.txt. If the API version was not changed, but
-   the hash differs, you will need to comment out the previous entry for that
-   API version. For instance, in NumPy 1.9 annotations were added, which
-   changed the hash, but the API was the same as in 1.8. The hash serves as a
-   check for API changes, but it is not definitive.
+   the API has changed, the cversions.txt file needs to be updated. To check
+   the hash, run the script numpy/core/cversions.py and note the api hash that
+   is printed. If that hash does not match the last hash in cversions.txt the
+   hash has changed. Using both the appropriate C_API_VERSION and hash, add a
+   new entry to numpy/core/code_generators/cversions.txt. If the API version
+   was not changed, but the hash differs, you will need to comment out the
+   previous entry for that API version. For instance, in NumPy 1.9 annotations
+   were added, which changed the hash, but the API was the same as in 1.8. The
+   hash serves as a check for API changes, but it is not definitive.
 
    If steps 1 and 2 are done correctly, compiling the release should not give
    a warning "API mismatch detect at the beginning of the build.
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