From 70350f4e2ca3afe5362a8b565f1d101221c4e6a8 Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Tue, 19 Jan 2016 18:42:23 -0700 Subject: [PATCH] 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. --- numpy/core/code_generators/cversions.txt | 1 + numpy/core/setup_common.py | 1 + pavement.py | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt index dea6d0ecf792..c66947fafe7c 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 57ddf3396c2e..ba7521e3043b 100644 --- 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 index ace0a5c022fc..01328442e0cd 100644 --- 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'