Add coverage to tox, fixup buildout

zopefoundation · Jan 12, 2018 · 6ed459f · 6ed459f
1 parent e8067d8
commit 6ed459f
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,13 @@
-__pycache__
-.coverage
+*.pyc
+.coverage*
 .installed.cfg
 .tox
-*.pyc
+__pycache__
 bin
 develop-eggs
-parts
+htmlcov/
+lib/
+parts/
+pip-selfcheck.json
+pyvenv.cfg
 src/*.egg-info
diff --git a/buildout.cfg b/buildout.cfg
@@ -13,7 +13,7 @@ grokcore.viewlet =
 [interpreter]
 recipe = zc.recipe.egg
 eggs = grokcore.viewlet
-interpreter = python
+interpreter = py
 
 [test]
 recipe = zc.recipe.testrunner

diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,4 @@
+# NOTE: setuptools and zc.buildout versions must be in sync with:
+# ztk-versions.cfg
+setuptools==38.2.4
+zc.buildout==2.10.0
diff --git a/tox.ini b/tox.ini
@@ -1,16 +1,38 @@
 [tox]
 envlist =
+    coverage-clean,
     py27,
     py34,
     py35,
     py36,
     pypy,
-    pypy3
+    pypy3,
+    coverage-report
 
 [testenv]
 commands =
-    coverage run -m zope.testrunner --test-path=src {posargs:-vc}
+    coverage run --source=grokcore.viewlet -m zope.testrunner --test-path=src {posargs:-vc}
+setenv =
+  COVERAGE_FILE=.coverage.{envname}
 deps =
     .[test]
     zope.testrunner
     coverage
+
+[testenv:coverage-clean]
+deps = coverage
+setenv =
+  COVERAGE_FILE=.coverage
+skip_install = true
+commands = coverage erase
+
+[testenv:coverage-report]
+deps = coverage
+setenv =
+  COVERAGE_FILE=.coverage
+skip_install = true
+commands =
+    coverage combine
+    coverage report
+    coverage html
+    coverage