summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile18
1 files changed, 6 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 59937c9..b44336a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
PATH := build/python/bin:$(PATH)
+VERSION = $(shell python setup.py --version)
ALLFILES = $(shell echo bottle.py test/*.py test/views/*.tpl)
-.PHONY: dist release install docs test coverage html_coverage pylint 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 2to3 clean
-dist:
- python setup.py sdist
-
-release:
- python setup.py release sdist upload
+release: test_all
+ 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
+ python setup.py sdist register upload # Release to pypi
install:
python setup.py install
@@ -18,12 +18,6 @@ docs:
test:
python test/testall.py
-coverage:
- python test/testall.py coverage
-
-html_coverage:
- python test/testall.py coverage html
-
test_all: test_25 test_26 test_27 test_31 test_32
test_25: