From 55846c7ac9f60dc2f5cc5cf8d83233d361e173f6 Mon Sep 17 00:00:00 2001 From: Andrei Fokau Date: Sat, 28 Oct 2017 11:00:35 +0000 Subject: [PATCH] Generate tl before tests; fix coverage. --- .travis.yml | 4 ++-- tox.ini | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 116ccd19..d02c9173 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ matrix: - python: 3.4 # i.e. skip installing 3.5 env: TOXENV=lint - python: 3.4 - env: TOXENV=coverage + env: TOXENV=coverage34 install: - pip install tox @@ -28,7 +28,7 @@ script: - tox after_success: - - if [[ $TOXENV =~ coverage ]]; then + - if [[ $TOXENV =~ coverage34 ]]; then pip install --quiet python-coveralls; coveralls --ignore-errors; fi diff --git a/tox.ini b/tox.ini index 40e162a3..4cdbf7b2 100644 --- a/tox.ini +++ b/tox.ini @@ -3,9 +3,12 @@ envlist = py34,py35,py36 [testenv] recreate = True -commands = coverage run setup.py test install_command = pip install {opts} {packages} +commands = + python setup.py clean_tl + python setup.py gen_tl + coverage run setup.py test deps = coverage [testenv:coverage] @@ -17,6 +20,20 @@ commands = deps = coverage +[testenv:coverage34] +basepython = python3.4 +install_command = + pip install {opts} {packages} +ignore_errors = True +commands = + python setup.py clean_tl + python setup.py gen_tl + coverage run setup.py test + coverage combine + coverage report +deps = + coverage + [testenv:lint] basepython = python3.4 skip_install = true