ensure single version of coverage, fix makefile

2015-09-26 14:02:16 -06:00
parent 44e9bba54e
commit 97b0020a5e
2 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@@ -8,7 +8,7 @@ test:
 coverage:
 	-rm test/.coverage
 # can we exclude just the flake8 environment?
-	tox -e py27-twisted,pypy-twisted,py34-twisted,py34-asyncio,py27-asyncio,pypy-asyncio,py27-twisted13
+	tox -e py27-tw154,pypy-tw154,py34-tw154,py34-asyncio,py27-asyncio,pypy-asyncio,py27-tw132
 	cd test && coverage combine
 	cd test && coverage html
 	cd test && coverage report --show-missing
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ deps =
    six
    mock
    pytest
-    coverage
+    coverage==4.0

    ; twisted dependencies
    tw121: twisted==12.1.0
@@ -36,7 +36,7 @@ changedir=test
 usedevelop=true

 commands =
-   coverage run --branch --parallel-mode --source=txaio {envbindir}/py.test -s --basetemp={envtmpdir}
+   coverage run --parallel-mode --source=txaio {envbindir}/py.test -s --basetemp={envtmpdir}


 [testenv:flake8]