diff --git a/.travis.yml b/.travis.yml index b1afbba0..8f6b4b78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ language: python install: - - "pip install ." - - "pip install tox" + - pip install tox script: - tox env: + - TOXENV=py26 - TOXENV=py27 + - TOXENV=coverage diff --git a/tox.ini b/tox.ini index 2f7e4741..e59de348 100644 --- a/tox.ini +++ b/tox.ini @@ -1,15 +1,36 @@ [tox] -envlist = py27 +envlist= + dev, coveralls, py26, py27 [testenv] deps= unittest2 + +[testenv:dev] +basepython=python +deps= + {[testenv]deps} + coverage +commands= + coverage erase + coverage run --rcfile=./.coveragerc -m unittest2 discover tests [] + coverage html --rcfile=./.coveragerc + +[testenv:coveralls] +basepython=python2.7 +deps= + {[testenv]deps} coverage coveralls - -[testenv:py27] commands= coverage erase coverage run --rcfile=./.coveragerc -m unittest2 discover tests [] coveralls - coverage erase + +[testenv:py26] +commands= + unit2 discover tests [] + +[testenv:py27] +commands= + unit2 discover tests []