Use tox generated environments to support coverage/no-coverage in bot…

…h Python

3.4 and 3.5.

.gitignore

@@ -24,4 +24,5 @@ var/*
 docs/_build/
 nosetests.xml
 __pycache__/
-htmlcov
+py34-cov
+py35-cov

coverage.ini → py34-coverage.ini

@@ -5,9 +5,9 @@ omit =
      setup*
      aiosmtpd/testing/*
      aiosmtpd/tests/*
-    .tox/coverage/lib/python3.4/site-packages/*
+    .tox/py34-cov/lib/python3.4/site-packages/*
 
 [paths]
 source =
     aiosmtpd
-    .tox/coverage/lib/python*/site-packages/aiosmtpd
+    .tox/py34-cov/lib/python*/site-packages/aiosmtpd

py35-coverage.ini

@@ -0,0 +1,13 @@
+[run]
+branch = true
+parallel = true
+omit =
+     setup*
+     aiosmtpd/testing/*
+     aiosmtpd/tests/*
+    .tox/py35-cov/lib/python3.5/site-packages/*
+
+[paths]
+source =
+    aiosmtpd
+    .tox/py35-cov/lib/python*/site-packages/aiosmtpd

tox.ini

@@ -1,32 +1,24 @@
 [tox]
-envlist = py34,py35
+envlist = {py34,py35}-{cov,nocov}
 recreate = True
 
 [testenv]
-commands = python -m nose2 -v
+commands =
+    nocov: python -m nose2 -v
+    cov: python -m coverage run {[coverage]rc} -m nose2 -v
+    cov: python -m coverage combine {[coverage]rc}
+    cov: python -m coverage html {[coverage]rc} {[coverage]dir}
 #sitepackages = True
 usedevelop = True
 deps =
     nose2
-    coverage
+    cov: coverage
+setenv =
+    cov: COVERAGE_PROCESS_START={[coverage]rcfile}
+    cov: COVERAGE_OPTIONS="-p"
+    cov: COVERAGE_FILE={toxinidir}/.coverage
 
 [coverage]
-rcfile = {toxinidir}/coverage.ini
+rcfile = {toxinidir}/{envname}erage.ini
 rc = --rcfile={[coverage]rcfile}
-
-[testenv:coverage]
-basepython = python3.4
-commands =
-    coverage run {[coverage]rc} -m nose2 -v
-    coverage combine {[coverage]rc}
-    coverage html {[coverage]rc}
-#sitepackages = True
-usedevelop = True
-whitelist_externals = python-coverage
-deps =
-     nose2
-     coverage
-setenv =
-    COVERAGE_PROCESS_START={[coverage]rcfile}
-    COVERAGE_OPTIONS="-p"
-    COVERAGE_FILE={toxinidir}/.coverage
+dir = --directory={envname}