From e577cb27229531abb5eb0aa5ef5c297225941acb Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Thu, 29 Nov 2018 14:02:29 +0100 Subject: [PATCH] Test on Python 3+. When using buildout for the tests they break because zc.buildout does not seem to be installed. --- .travis.yml | 17 ++++++++++------- CHANGES.rst | 2 +- tox.ini | 16 ++++++---------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 33c1e93..ca52d14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,20 @@ language: python -sudo: false +dist: xenial python: - 2.7 - - 3.5 - 3.6 + - 3.7 +before_install: + - pip install -U setuptools pip + - pip install -U coverage coveralls zope.testrunner install: - - python bootstrap.py - - bin/buildout + - pip install -U -e .[zrs] script: - - bin/test -v1 + - COVERAGE_PROCESS_START=.coveragerc coverage run -m zope.testrunner --test-path=src --all -v1 notifications: email: false +after_success: + - coverage combine + - coveralls cache: pip: true - directories: - - eggs/ diff --git a/CHANGES.rst b/CHANGES.rst index e732116..f368d46 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -10,7 +10,7 @@ Breaking changes: New features: -- *add item here* +- Add support for Python 3.6 and 3.7. Bug fixes: diff --git a/tox.ini b/tox.ini index 74aa833..a59e5f5 100644 --- a/tox.ini +++ b/tox.ini @@ -2,24 +2,19 @@ envlist = flake8, py27, - py35, py36, + py37, coverage, skip_missing_interpreters = False [testenv] +usedevelop = true 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} -n install test - coverage run {envbindir}/test --all {posargs:-vc} -skip_install = true + zope-testrunner --test-path=src --all {posargs:-vc} +extras = zrs deps = - setuptools==33.1.1 - zc.buildout - coverage -setenv = - COVERAGE_FILE=.coverage.{envname} + zope.testrunner [testenv:coverage] basepython = python2.7 @@ -35,5 +30,6 @@ commands = [testenv:flake8] basepython = python2.7 +skip_install = true deps = flake8 commands = flake8 --doctests src setup.py