- finalize tox config and simplify Travis CI config

zopefoundation · Apr 11, 2019 · d2099bc · d2099bc
1 parent 36f6309
commit d2099bc
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 59 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,27 +1,37 @@
 language: python
-sudo: false
-python:
-    - 2.7
-    - 3.5
-    - 3.6
+
 matrix:
     include:
+        - 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"
+          env: TOXENV=py35
+        - python: "3.6"
+          env: TOXENV=py36
         - python: "3.7"
+          env: TOXENV=py37
           dist: xenial
-          sudo: true
+        - python: "3.8-dev"
+          env: TOXENV=py38
+          dist: xenial
+
 install:
-    - pip install six==1.10.0 # force here to avoid conflit with zc.recipe.testrunner
-    - pip install coveralls coverage
-    - pip install zc.buildout
-    - buildout bootstrap
-    - buildout
+    - travis_retry pip install -U pip setuptools
+    - travis_retry pip install -U tox coveralls coverage
+
 script:
-    - coverage run bin/test -v1
-after_success:
-    - coverage combine
-    - coveralls
+    - travis_retry tox
+
 notifications:
     email: false
+
 cache:
   pip: true
   directories:

diff --git a/tox.ini b/tox.ini
@@ -1,12 +1,10 @@
 [tox]
 envlist =
-    # flake8,
     py27,
     py35,
     py36,
     py37,
     py-38,
-    # isort,
     lint,
     coverage,
 
@@ -20,35 +18,10 @@ commands =
 deps =
     zc.buildout
 skip_install = true
-#usedevelop = True
-#extras =
-#    develop
-#    test
-#
-#install_command = pip install --no-cache-dir --no-binary=:all: {opts} {packages}
-#
-#commands =
-#    coverage run {envbindir}/zope-testrunner --path=src --all {posargs:-pvc}
-#deps =
-#    .[test]
-#    zope.testrunner
-#    coverage
-#setenv =
-#    PIP_NO_CACHE = 1
-#    COVERAGE_FILE=.coverage.{envname}
+    COVERAGE_FILE=.coverage.{envname}
 
 [testenv:coverage]
 basepython = python3.6
-#deps = coverage
-#setenv =
-#    COVERAGE_FILE=.coverage
-#skip_install = true
-#commands =
-#    coverage erase
-#    coverage combine
-#    coverage html -i
-#    coverage xml -i
-#    coverage report -i --fail-under=79
 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
@@ -63,22 +36,6 @@ deps =
 setenv =
     COVERAGE_FILE={toxinidir}/.coverage
 
-#[testenv:isort]
-#basepython = python2.7
-#deps = isort
-#commands =
-#    isort --check-only --recursive {toxinidir}/src {toxinidir}/tests {posargs}
-#
-#[testenv:isort-apply]
-#basepython = python2.7
-#deps = isort
-#commands =
-#    isort --apply --recursive {toxinidir}/src {toxinidir}/tests {posargs}
-
-#[testenv:flake8]
-#basepython = python2.7
-#deps = flake8
-#commands = flake8 --doctests src tests setup.py
 [testenv:lint]
 basepython = python3.6
 commands_pre =