From 2ae6ac2bfdcf628efcbb9a6d14143c2d1b6b253e Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Fri, 10 Jul 2015 17:13:25 +0000 Subject: [PATCH] Travis: tox-venv activation path adjustment --- .dockerignore | 2 +- .travis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index 203d8000f..0bdb9e62d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,5 @@ # this file uses slightly different syntax than .gitignore, -# e.g. ".tox/" will not ignore .tox directory +# e.g. "tox.cover/" will not ignore tox.cover directory # well, official docker build should be done on clean git checkout # anyway, so .tox should be empty... But I'm sure people will try to diff --git a/.travis.yml b/.travis.yml index a7b03d20a..a9769ed78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ env: install: "travis_retry pip install tox coveralls" before_script: '[ "${TOXENV:0:2}" != "py" ] || ./tests/boulder-start.sh' # TODO: eliminate substring slice bashism -script: 'travis_retry tox && ([ "${TOXENV:0:2}" != "py" ] || (source .tox/$TOXENV/bin/activate && ./tests/boulder-integration.sh))' +script: 'travis_retry tox && ([ "${TOXENV:0:2}" != "py" ] || (source tox.venv/$TOXENV/bin/activate && ./tests/boulder-integration.sh))' after_success: '[ "$TOXENV" == "cover" ] && coveralls'