From 275da3c2d26acff4c9f94804a5b4ef5f3c0e0853 Mon Sep 17 00:00:00 2001 From: Ben Darnell Date: Mon, 30 Dec 2013 11:58:31 -0500 Subject: [PATCH] Correctly skip coverage collection on 2.6. --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ee8f9c05..77d5644a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,11 @@ python: - pypy - 3.2 - 3.3 + env: - DEPS=true - DEPS=false + install: # always install unittest2 on py26 even if $DEPS is unset - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install --use-mirrors unittest2; fi @@ -19,6 +21,7 @@ install: - if [[ $TRAVIS_PYTHON_VERSION == '3.3' && $DEPS == true ]]; then pip install --use-mirrors pycares; fi - python setup.py install - pip install --use-mirrors coveralls + script: # Must cd somewhere else so python3 doesn't get confused and run # the python2 code from the current directory instead of the installed @@ -29,7 +32,6 @@ script: # so we can pass additional arguments to python. However, this doesn't # work on 2.6, so skip coverage on that version. - if [[ $TRAVIS_PYTHON_VERSION != 2.6 ]]; then export TARGET="-m coverage run $TARGET"; fi - - export TARGET="-m coverage run -m tornado.test.runtests" - python $TARGET - python $TARGET --ioloop=tornado.platform.select.SelectIOLoop - python -O $TARGET @@ -44,5 +46,6 @@ script: - if [[ $TRAVIS_PYTHON_VERSION != pypy && $DEPS == true ]]; then python $TARGET --resolver=tornado.platform.caresresolver.CaresResolver; fi - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then python $TARGET --ioloop_time_monotonic; fi - if [[ $TRAVIS_PYTHON_VERSION == '2.7' && $DEPS == true ]]; then cd ../docs && mkdir sphinx-out && sphinx-build -E -n -W -b html . sphinx-out; fi + after_success: coveralls \ No newline at end of file