summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2011-07-19 21:33:21 +0200
committerMarcel Hellkamp <marc@gsites.de>2011-07-19 21:34:51 +0200
commit351f22a541c22fc1ff08eb9229ed0aeac3d30223 (patch)
tree52b76795e4cd351653290921b5b2d4d56e4063e5
parentd832e7d8da59d46702a4be42597f6cfa152c36ce (diff)
downloadbottle-351f22a541c22fc1ff08eb9229ed0aeac3d30223.tar.gz
Version bump (bugfix).0.9.6
Fix: Windows GAE crashes Fix: 'make release'
-rw-r--r--Makefile4
-rwxr-xr-xbottle.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index b44336a..a4bc9f7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,9 @@ ALLFILES = $(shell echo bottle.py test/*.py test/views/*.tpl)
.PHONY: release install docs test test_all test_25 test_26 test_27 test_31 test_32 2to3 clean
-release: test_all
+release: test
python setup.py --version | egrep -q -v '[a-zA-Z]' # Fail on dev/rc versions
- git -a -m "Release of $(VERSION)" $(VERSION) # Fail on existing tags
+ git tag -a -m "Release of $(VERSION)" $(VERSION) # Fail on existing tags
python setup.py sdist register upload # Release to pypi
install:
diff --git a/bottle.py b/bottle.py
index fbfe019..8f6e7b6 100755
--- a/bottle.py
+++ b/bottle.py
@@ -15,7 +15,7 @@ License: MIT (see LICENSE.txt for details)
from __future__ import with_statement
__author__ = 'Marcel Hellkamp'
-__version__ = '0.9.5'
+__version__ = '0.9.6'
__license__ = 'MIT'
import base64