diff --git a/.frigg.yml b/.frigg.yml index b9ce18d..4b7d6b8 100644 --- a/.frigg.yml +++ b/.frigg.yml @@ -2,17 +2,11 @@ tasks: - echo 'USE_SQLITE=True' > tests/local.py - tox -e flake8 - tox -e isort - - tox -e py27-django14 - - tox -e py27-django15 - - tox -e py27-django16 - - tox -e py27-django17 - - tox -e py27-django18 - - tox -e py34-django15 - - tox -e py34-django16 - - tox -e py34-django17 - - tox -e py34-django18 - - tox -e py34-django19 - - coverage combine && coverage report && coverage xml + - tox -e py2-django18 + - tox -e py2-django19 + - tox -e py3-django18 + - tox -e py3-django19 + - tox -e coverage coverage: path: coverage.xml diff --git a/tox.ini b/tox.ini index f89a5c6..3f0a74d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,14 @@ [tox] envlist = flake8,isort - {py27,py3}-{django18,django19} + {py2,py3}-{django18,django19}, + coverage skipsdist = True [testenv] basepython = py3: python3 - py27: python2 + py2: python2 setenv = PYTHONPATH = {toxinidir}:{toxinidir} commands = @@ -26,3 +27,8 @@ commands = flake8 basepython = python3 deps = isort commands = isort -c -rc nopassword tests + +[testenv:coverage] +basepython = python3 +deps = coverage +commands = coverage combine && coverage report && coverage xml