diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2016-01-19 19:22:58 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2016-01-19 19:22:58 -0700 |
| commit | 58089f3ef9e18f3a4f7634e1b84eebefd45605f8 (patch) | |
| tree | 4628b129173c78f1f7c64cf7ae4f4a71c8c972fc | |
| parent | 275fa79351e5fb30c19d78f29513a5be646ca1c8 (diff) | |
| parent | 70350f4e2ca3afe5362a8b565f1d101221c4e6a8 (diff) | |
| download | numpy-58089f3ef9e18f3a4f7634e1b84eebefd45605f8.tar.gz | |
Merge pull request #7062 from charris/pre-1.10.x-branch
REL: Prepare for 1.10.x branch.
| -rw-r--r-- | numpy/core/code_generators/cversions.txt | 1 | ||||
| -rw-r--r-- | numpy/core/setup_common.py | 1 | ||||
| -rw-r--r-- | pavement.py | 2 |
3 files changed, 3 insertions, 1 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): diff --git a/pavement.py b/pavement.py index ace0a5c02..01328442e 100644 --- a/pavement.py +++ b/pavement.py @@ -102,7 +102,7 @@ finally: 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' |