tox.ini: Doing...

tox.ini

+#
+# Tox global configuration
+#
 [tox]
 envlist = py35,py36,py37
 skip_missing_interpreters = true
 
-[testenv:py{35,36,37}]
-changedir = {envdir}
+#
+# Defaults for all environments
+#
+# Anything specified here is iherited by the sections
+#
+[testenv]
 commands =
     pytest --basetemp {envtmpdir} {posargs} {toxinidir}
     mkdir -p {toxinidir}/.coverage-reports
-    cp $COVERAGE_FILE {toxinidir}/.coverage-reports
+    cp .coverage.{env:COVERAGE_PREFIX:}{envname} {toxinidir}/.coverage-reports
 deps =
     -rrequirements/requirements.txt
     -rrequirements/dev-requirements.txt
@@ -16,26 +23,42 @@ passenv =
     BST_FORCE_BACKEND
     GI_TYPELIB_PATH
     INTEGRATION_CACHE
+
+changedir =
+    py{35,36,37}: {envdir}
 setenv =
-    COVERAGE_FILE = .coverage.{env:COVERAGE_PREFIX:}{envname}
+    py{35,36,37}: COVERAGE_FILE = .coverage.{env:COVERAGE_PREFIX:}{envname}
+whitelist_externals =
+    py{35,36,37}: cp
 
-[testenv:lint]
+#
+# Coverage reporting
+#
+[testenv:coverage]
 commands =
-    pycodestyle
-    pylint buildstream
+    coverage combine --rcfile={toxinidir}/.coveragerc --append {toxinidir}/.coverage-reports/
+    coverage report --rcfile={toxinidir}/.coveragerc -m
 deps =
     -rrequirements/requirements.txt
     -rrequirements/dev-requirements.txt
-    -rrequirements/plugin-requirements.txt
+setenv =
+    COVERAGE_FILE = {toxinidir}/.coverage-reports/.coverage
 
-[testenv:coverage]
+#
+# Running linters
+#
+[testenv:lint]
 commands =
-    coverage combine --rcfile={toxinidir}/.coveragerc -a {toxinidir}/.coverage-reports/coverage.*
-    coverage report --rcfile={toxinidir}/.coveragerc -m
+    pycodestyle
+    pylint buildstream
 deps =
     -rrequirements/requirements.txt
     -rrequirements/dev-requirements.txt
+    -rrequirements/plugin-requirements.txt
 
+#
+# Building documentation
+#
 [testenv:docs]
 commands =
     make -C doc