summaryrefslogtreecommitdiff
path: root/numpy/core
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2016-01-19 18:42:23 -0700
committerCharles Harris <charlesr.harris@gmail.com>2016-01-19 18:42:23 -0700
commit70350f4e2ca3afe5362a8b565f1d101221c4e6a8 (patch)
tree4628b129173c78f1f7c64cf7ae4f4a71c8c972fc /numpy/core
parent275fa79351e5fb30c19d78f29513a5be646ca1c8 (diff)
downloadnumpy-70350f4e2ca3afe5362a8b565f1d101221c4e6a8.tar.gz
REL: Prepare for 1.10.x branch.
* Add comment to cversions.txt (no change) * Add comment to setup_common.py (no change) * Nothing done for numpy/core/include/numpy/numpyconfig.h * Update log start to 1.10.0 in pavement.py.
Diffstat (limited to 'numpy/core')
-rw-r--r--numpy/core/code_generators/cversions.txt1
-rw-r--r--numpy/core/setup_common.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt
index dea6d0ecf..c66947faf 100644
--- a/numpy/core/code_generators/cversions.txt
+++ b/numpy/core/code_generators/cversions.txt
@@ -31,4 +31,5 @@
0x00000009 = 982c4ebb6e7e4c194bf46b1535b4ef1b
# Version 10 (NumPy 1.10) Added PyArray_CheckAnyScalarExact
+# Version 10 (NumPy 1.11) No change.
0x0000000a = 9b8bce614655d3eb02acddcb508203cb
diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py
index 57ddf3396..ba7521e30 100644
--- a/numpy/core/setup_common.py
+++ b/numpy/core/setup_common.py
@@ -36,6 +36,7 @@ C_ABI_VERSION = 0x01000009
# 0x00000009 - 1.8.x
# 0x00000009 - 1.9.x
# 0x0000000a - 1.10.x
+# 0x0000000a - 1.11.x
C_API_VERSION = 0x0000000a
class MismatchCAPIWarning(Warning):