- clean up tox and Travis configurations

zopefoundation · Apr 2, 2019 · c91d786 · c91d786
1 parent 21863e6
commit c91d786
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 34 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,28 +1,35 @@
-sudo: false
 language: python
-python:
-  - "2.7"
-  - "3.5"
-  - "3.6"
 matrix:
     include:
+        - python: "3.6"
+          env: TOXENV=flake8
+        - python: "3.6"
+          env: TOXENV=coverage
+          after_success:
+              - coveralls
+        - python: "2.7"
+          env: TOXENV=py27
+        - python: "3.5"
+          env: TOXENV=py35
+        - python: "3.6"
+          env: TOXENV=py36
         - python: "3.7"
-          dist: xenial
-        - python: "3.8-dev"
+          env: TOXENV=py37
           dist: xenial
     allow_failures:
         - python: "3.8-dev"
+          env: TOXENV=py38
           dist: xenial
+
 install:
-    - pip install -U coverage coveralls
-    - pip install zc.buildout
-    - buildout
+    - travis_retry pip install -U pip setuptools tox coveralls
+
 script:
-    - coverage run bin/test -vvc
-after_success:
-    - coveralls
+    - travis_retry tox
+
 notifications:
     email: false
+
 cache:
     - pip: true
     - directories:

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,4 @@
 [tox]
-minversion = 1.9
 envlist =
    py27,
    py35,
@@ -12,42 +11,40 @@ envlist =
 
 [testenv]
 commands =
-    {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} buildout:sources-dir={toxinidir}/src bootstrap
-    {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} buildout:sources-dir={toxinidir}/src install test
-    coverage run {envbindir}/test {posargs}
-
-skip_install = true
+    {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 {posargs}
 deps =
     zc.buildout
-    coverage
-
-setenv =
-    COVERAGE_FILE=.coverage.{envname}
+skip_install = true
 
 [testenv:coverage]
 basepython = python3.6
-deps = coverage
-setenv =
-    COVERAGE_FILE=.coverage
 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 combine
-    coverage html
-    coverage xml
+    coverage run {envbindir}/test {posargs}
+    - coverage combine
+    - coverage html
+    - coverage xml
     coverage report
+deps = 
+    {[testenv]deps}
+    coverage
+setenv =
+    COVERAGE_FILE=.coverage
 
 [testenv:flake8]
 basepython = python3.6
+commands =
+    - flake8 --format=html --htmldir={toxinidir}/parts/flake8 --doctests Products tests setup.py {posargs}
+    flake8 --doctests Products tests setup.py {posargs}
 deps =
     flake8
     flake8-html
     flake8-debugger
 
-commands =
-    - flake8 --format=html --htmldir={toxinidir}/parts/flake8 --doctests Products tests setup.py {posargs}
-    flake8 --doctests Products tests setup.py {posargs}
-
-
 [testenv:docs]
 basepython =
     python3.6