summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2014-05-04 16:23:08 -0600
committerCharles Harris <charlesr.harris@gmail.com>2014-05-04 22:05:45 -0600
commit98392ebd3a78f573e498118e56285bf703256b5d (patch)
tree8fd6261f511d0efdbeb5f9f305ea62a1b7246185 /numpy
parent906ecabd71acc78b1d3ab658187919e196ee54d4 (diff)
downloadnumpy-98392ebd3a78f573e498118e56285bf703256b5d.tar.gz
MAINT: Update the C-API hash in cversions.txt.
The new annotations caused the api hash to change.
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/code_generators/cversions.txt16
-rw-r--r--numpy/core/setup_common.py1
2 files changed, 15 insertions, 2 deletions
diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt
index 6ab422055..d62115224 100644
--- a/numpy/core/code_generators/cversions.txt
+++ b/numpy/core/code_generators/cversions.txt
@@ -4,16 +4,28 @@
0x00000001 = 603580d224763e58c5e7147f804dc0f5
0x00000002 = 8ecb29306758515ae69749c803a75da1
0x00000003 = bf22c0d05b31625d2a7015988d61ce5a
+
# Starting from here, the hash is defined from numpy_api.full_api dict
# version 4 added neighborhood iterators and PyArray_Correlate2
0x00000004 = 3d8940bf7b0d2a4e25be4338c14c3c85
0x00000005 = 77e2e846db87f25d7cf99f9d812076f0
+
# Version 6 (NumPy 1.6) added new iterator, half float and casting functions,
# PyArray_CountNonzero, PyArray_NewLikeArray and PyArray_MatrixProduct2.
0x00000006 = e61d5dc51fa1c6459328266e215d6987
+
# Version 7 (NumPy 1.7) improved datetime64, misc utilities.
0x00000007 = e396ba3912dcf052eaee1b0b203a7724
+
# Version 8 Added interface to MapIterObject
0x00000008 = 17321775fc884de0b1eda478cd61c74b
-# Version 9 Added interface for partition functions, PyArray_NEW_ZEROED
-0x00000009 = 327bd114df09c2eb7a0bcc6901e2a3ed
+
+# Version 9 (NumPy 1.8) Added interface for partition functions,
+# PyArray_NEW_ZEROED, commented out as the hash changed in
+# Numpy 1.9 due to annotation.
+#0x00000009 = 327bd114df09c2eb7a0bcc6901e2a3ed
+
+# Version 9 (NumPy 1.9) Added function annotations.
+# The interface has not changed, but the hash is different due to
+# the annotations, so keep the previous version number.
+0x00000009 = 49b27dc2dc7206a775a7376fdbc3b80c
diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py
index 4188f4c3f..85e92d923 100644
--- a/numpy/core/setup_common.py
+++ b/numpy/core/setup_common.py
@@ -34,6 +34,7 @@ C_ABI_VERSION = 0x01000009
#
# 0x00000008 - 1.7.x
# 0x00000009 - 1.8.x
+# 0x00000009 - 1.9.x
C_API_VERSION = 0x00000009
class MismatchCAPIWarning(Warning):