From 97b0020a5ec1817eaf5afaadb81f1b4055a686e9 Mon Sep 17 00:00:00 2001
From: meejah <meejah@meejah.ca>
Date: Sat, 26 Sep 2015 14:02:16 -0600
Subject: [PATCH] ensure single version of coverage, fix makefile

---
 Makefile | 2 +-
 tox.ini  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 526fb00..0cae823 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/tox.ini b/tox.ini
index 77ca245..096ffcc 100644
--- 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]