Re-enable combined coverage to get coverage for Python 2, too. (#86)

Fixes #85.
zopefoundation · May 8, 2019 · fb978ac · fb978ac
1 parent caaf7ca
commit fb978ac
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,11 @@
 language: python
+dist: xenial
 
 matrix:
     include:
-        - python: "3.6"
+        - name: "lint"
+          python: "3.6"
           env: TOXENV=lint
-        - python: "3.6"
-          env: TOXENV=coverage
-          after_success:
-              - coverage combine
-              - coveralls
         - python: "2.7"
           env: TOXENV=py27
         - python: "3.5"
@@ -17,10 +14,8 @@ matrix:
           env: TOXENV=py36
         - python: "3.7"
           env: TOXENV=py37
-          dist: xenial
         - python: "3.8-dev"
           env: TOXENV=py38
-          dist: xenial
 
 install:
     - travis_retry pip install -U pip setuptools
@@ -29,6 +24,10 @@ install:
 script:
     - travis_retry tox
 
+after_success:
+    - coverage combine
+    - coveralls
+
 notifications:
     email: false
 

diff --git a/setup.cfg b/setup.cfg
@@ -40,7 +40,7 @@ source = src
 omit =
 
 [coverage:report]
-fail_under = 78.00
+fail_under = 79.50
 ignore_errors = True
 precision = 2
 show_missing = False

diff --git a/tox.ini b/tox.ini
@@ -14,26 +14,26 @@ skip_missing_interpreters = False
 commands =
     {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} bootstrap
     {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
-    {envbindir}/test --all {posargs:-pvc}
+    coverage run {envbindir}/test --all {posargs:-pvc}
 deps =
     zc.buildout
+    coverage
 skip_install = true
+setenv =
+    COVERAGE_FILE=.coverage.{envname}
 
 [testenv:coverage]
-basepython = python3.6
+basepython = python3.7
 commands =
-    {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} bootstrap
-    {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
     coverage erase
-    coverage run {envbindir}/test -q
+    coverage combine
     - coverage html -i --rcfile={toxinidir}/setup.cfg
     - coverage xml -i --rcfile={toxinidir}/setup.cfg
     coverage report --rcfile={toxinidir}/setup.cfg
 deps =
-    {[testenv]deps}
     coverage
 setenv =
-    COVERAGE_FILE={toxinidir}/.coverage
+    COVERAGE_FILE=.coverage
 
 [testenv:lint]
 basepython = python3.6