diff --git a/.travis.yml b/.travis.yml index 25ff8a1..dfec144 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,9 @@ language: python env: - - TOX_ENV=py27 - - TOX_ENV=py33 - - TOX_ENV=py34 - - TOX_ENV=coverage + - TOX_ENV=py27,py27-coverage + - TOX_ENV=py33,py33-coverage + - TOX_ENV=py34,py34-coverage - TOX_ENV=pep8 before_install: @@ -63,4 +62,5 @@ install: - pip install tox script: + - tox --version - tox -e $TOX_ENV diff --git a/tox.ini b/tox.ini index 5e53f76..ceda372 100644 --- a/tox.ini +++ b/tox.ini @@ -1,27 +1,44 @@ [tox] -envlist = py27, py33, py34 +minversion = 1.4 +envlist = py27, py33, py34 + +[pep8] +exclude = qpol.py +max-line-length = 100 [testenv:pep8] -deps = pep8 -commands = pep8 setools/ setools/policyrep/ tests/ \ - seinfo seinfoflow sedta sesearch \ - --exclude qpol.py --statistics --max-line-length=100 +deps = pep8 +commands = pep8 --version + pep8 setools/ tests/ seinfo seinfoflow sedta sesearch --statistics -v -[testenv:coverage] -deps = networkx==1.9 - coverage -commands = coverage erase - coverage run setup.py test - coverage report +[testenv:py27-coverage] +basepython = python2.7 +deps = {[testenv]deps} + coverage +commands = coverage --version + coverage erase + coverage run setup.py test + coverage report -[testenv:coverage-html] -deps = networkx==1.9 - coverage -commands = coverage erase - coverage run setup.py test - coverage report - coverage html +[testenv:py33-coverage] +basepython = python3.3 +deps = {[testenv]deps} + coverage +commands = coverage --version + coverage erase + coverage run setup.py test + coverage report + +[testenv:py34-coverage] +basepython = python3.4 +deps = {[testenv]deps} + coverage +commands = coverage --version + coverage erase + coverage run setup.py test + coverage report [testenv] -deps = networkx==1.9 -commands = {envpython} setup.py test +deps = networkx==1.9 +commands = {envpython} setup.py test +recreate = True