summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2016-09-11 19:15:48 -0600
committerCharles Harris <charlesr.harris@gmail.com>2016-09-11 19:15:48 -0600
commitfe3e46d2876af2546a5fcc752ead8aa736ea2658 (patch)
tree09c2f5e1117cd9526e80755f416f41893283da97
parente57701a40403af59d07505bf4938fccdcf21bf49 (diff)
downloadnumpy-fe3e46d2876af2546a5fcc752ead8aa736ea2658.tar.gz
REL: NumPy 1.11.2rc1.v1.11.2rc1
-rw-r--r--pavement.py4
-rwxr-xr-xsetup.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/pavement.py b/pavement.py
index 82c0343e6..a22dccbb0 100644
--- a/pavement.py
+++ b/pavement.py
@@ -99,10 +99,10 @@ finally:
#-----------------------------------
# Source of the release notes
-RELEASE_NOTES = 'doc/release/1.11.0-notes.rst'
+RELEASE_NOTES = 'doc/release/1.11.2-notes.rst'
# Start/end of the log (from git)
-LOG_START = 'v1.10.0'
+LOG_START = 'v1.11.1'
LOG_END = 'maintenance/1.11.x'
diff --git a/setup.py b/setup.py
index 19b19f2ba..be6d4867e 100755
--- a/setup.py
+++ b/setup.py
@@ -58,9 +58,9 @@ Operating System :: MacOS
MAJOR = 1
MINOR = 11
-MICRO = 0
-ISRELEASED = False
-VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)
+MICRO = 2
+ISRELEASED = True
+VERSION = '%d.%d.%drc1' % (MAJOR, MINOR, MICRO)
# Return the git revision as a string