Merge pull request numpy#7062 from charris/pre-1.10.x-branch

charris · charris · commit 58089f3ef9e1 · 2016-01-19T19:22:58.000-07:00
REL: Prepare for 1.10.x branch.
diff --git 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
@@ -36,6 +36,7 @@
 # 0x00000009 - 1.8.x
 # 0x00000009 - 1.9.x
 # 0x0000000a - 1.10.x
+# 0x0000000a - 1.11.x
 C_API_VERSION = 0x0000000a
 
 class MismatchCAPIWarning(Warning):
diff --git a/pavement.py b/pavement.py
@@ -102,7 +102,7 @@
 RELEASE_NOTES = 'doc/release/1.11.0-notes.rst'
 
 # Start/end of the log (from git)
-LOG_START = 'v1.10.0b1'
+LOG_START = 'v1.10.0'
 LOG_END = 'master'
 
 
