Merge pull request #6 from gyst/master

Fixup buildout and add coverage to tox

.gitignore

@@ -1,13 +1,15 @@
 *.pyc
-__pycache__
-src/*.egg-info
-
 .coverage
 .coverage.*
 .installed.cfg
 .tox
+__pycache__
 bin
 coverage.xml
 develop-eggs
 htmlcov/
+lib/
 parts
+pip-selfcheck.json
+pyvenv.cfg
+src/*.egg-info

buildout.cfg

@@ -15,12 +15,12 @@ grokcore.content =
 [interpreter]
 recipe = zc.recipe.egg
 eggs = grokcore.content
-interpreter = python
+interpreter = py
 
 [test]
 recipe = zc.recipe.testrunner
 eggs = grokcore.content [test]
-defaults = ['--tests-pattern', '^f?tests$', '-v', '-c']
+defaults = ['-v', '-c']
 
 [releaser]
 recipe = zc.recipe.egg

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

tox.ini

@@ -1,15 +1,19 @@
 [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.content -m zope.testrunner --test-path=src {posargs:-vc}
+setenv =
+  COVERAGE_FILE=.coverage.{envname}
 deps =
     .[test]
     zope.testrunner
@@ -31,4 +35,4 @@ commands =
     coverage combine
     coverage report
     coverage html
-    coverage xml
+    coverage