summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2012-10-17 23:30:09 +0200
committerMarcel Hellkamp <marc@gsites.de>2012-10-17 23:30:44 +0200
commit97184f651205b01bcec78d2ff5f139116042fb02 (patch)
treee0c0a879283b0973020fe83719842b609588db21
parente227e692e70c86662b827cb67e22681b1da10ba7 (diff)
downloadbottle-97184f651205b01bcec78d2ff5f139116042fb02.tar.gz
Fixed release rule in Makefile and added test_33
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 9bc4d83..40b5384 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,14 @@ PATH := build/python/bin:$(PATH)
VERSION = $(shell python setup.py --version)
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
+.PHONY: release install docs test test_all test_25 test_26 test_27 test_31 test_32 test_33 2to3 clean
release: test_all
python setup.py --version | egrep -q -v '[a-zA-Z]' # Fail on dev/rc versions
git commit -e -m "Release of $(VERSION)" # Fail on nothing to commit
git tag -a -m "Release of $(VERSION)" $(VERSION) # Fail on existing tags
git push origin HEAD # Fail on out-of-sync upstream
- git push tag $(VERSION) # Fail on dublicate tag
+ git push origin tag $(VERSION) # Fail on dublicate tag
python setup.py sdist register upload # Release to pypi
push: test_all
@@ -24,7 +24,7 @@ docs:
test:
python test/testall.py
-test_all: test_25 test_26 test_27 test_31 test_32
+test_all: test_25 test_26 test_27 test_31 test_32 test_33
test_25:
python2.5 test/testall.py
@@ -41,6 +41,9 @@ test_31:
test_32:
python3.2 test/testall.py
+test_33:
+ python3.3 test/testall.py
+
clean:
find . -name '*.pyc' -exec rm -f {} +
find . -name '*.pyo' -exec rm -f {} +