Remove shared tox venv

This commit is contained in:
Jakub Warmuz 2015-07-12 15:04:01 +00:00
parent 12720a2252
commit 7bc1cd4454
No known key found for this signature in database
GPG key ID: 2A7BAD3A489B52EA
2 changed files with 1 additions and 6 deletions

View file

@ -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.venv/bin/activate && ./tests/boulder-integration.sh))'
script: 'travis_retry tox && ([ "${TOXENV:0:2}" != "py" ] || (source .tox/$TOXENV/bin/activate && ./tests/boulder-integration.sh))'
after_success: '[ "$TOXENV" == "cover" ] && coveralls'

View file

@ -9,10 +9,6 @@ skipsdist = true
envlist = py26,py27,py34,cover,lint
[testenv]
# share one venv across testenvs, instead of multiple
# .tox/{py26,py27,cover,lint}; but do NOT set envdir to
# {toxinidir}/venv as it will destroy existing dev venv
envdir = {toxinidir}/tox.venv
commands =
pip install -r requirements.txt -e acme -e .[testing] -e letsencrypt-apache -e letsencrypt-nginx
# -q does not suppress errors
@ -27,7 +23,6 @@ setenv =
# https://testrun.org/tox/latest/example/basic.html#special-handling-of-pythonhas
[testenv:py34]
envdir = {toxinidir}/tox.venv3
commands =
pip install -e acme[testing]
nosetests acme/acme