summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2018-11-04 09:17:04 -0700
committerCharles Harris <charlesr.harris@gmail.com>2018-11-04 09:17:04 -0700
commit3430d78c01a3b9a19adad75f1acb5ae18286da73 (patch)
tree2f12431ab683409544faa3f5b467d848ec55d788
parentde28edd8f514b82c0524b55f622078d47f479322 (diff)
downloadnumpy-maintenance/1.15.x.tar.gz
REL: prepare 1.15.x for further developmentmaintenance/1.15.x
-rw-r--r--pavement.py2
-rwxr-xr-xsetup.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/pavement.py b/pavement.py
index d0818e66b..61c627443 100644
--- a/pavement.py
+++ b/pavement.py
@@ -98,7 +98,7 @@ finally:
RELEASE_NOTES = 'doc/release/1.15.4-notes.rst'
# Start/end of the log (from git)
-LOG_START = 'v1.15.3'
+LOG_START = 'v1.15.4'
LOG_END = 'maintenance/1.15.x'
diff --git a/setup.py b/setup.py
index 060e82c54..06b8d2e3f 100755
--- a/setup.py
+++ b/setup.py
@@ -64,8 +64,8 @@ Operating System :: MacOS
MAJOR = 1
MINOR = 15
-MICRO = 4
-ISRELEASED = True
+MICRO = 5
+ISRELEASED = False
VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)