Merge branch 'master' into makecov

2017-05-22 14:14:40 -07:00 · 2017-05-22 14:14:40 -07:00 · 4cd0299aff
commit 4cd0299aff
parent 5cadd4a348 e706b5e544
126 changed files with 2799 additions and 1474 deletions
--- a/8
+++ b/8
@ -3,12 +3,8 @@
 all: clean-pyc test

 test:
-	pip install -r test-requirements.txt -q
-	FLASK_DEBUG= py.test tests examples
-
-tox-test:
-	pip install -r test-requirements.txt -q
-	tox
+	pip install -r test-requirements.txt
+	tox -e py-release

 cov:
 	pip install -r test-requirements.txt -q