diff --git a/.travis.yml b/.travis.yml index 87db5e046..acd711917 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,28 +13,16 @@ env: - TOX_ENV=py33-django17 - TOX_ENV=py32-django17 - TOX_ENV=py27-django17 - - TOX_ENV=py34-django16 - - TOX_ENV=py33-django16 - - TOX_ENV=py32-django16 - - TOX_ENV=py27-django16 - - TOX_ENV=py26-django16 - - TOX_ENV=py34-django15 - - TOX_ENV=py33-django15 - - TOX_ENV=py32-django15 - - TOX_ENV=py27-django15 - - TOX_ENV=py26-django15 - TOX_ENV=py27-djangomaster - - TOX_ENV=py32-djangomaster - - TOX_ENV=py33-djangomaster - TOX_ENV=py34-djangomaster + - TOX_ENV=py35-djangomaster matrix: fast_finish: true allow_failures: - env: TOX_ENV=py27-djangomaster - - env: TOX_ENV=py32-djangomaster - - env: TOX_ENV=py33-djangomaster - env: TOX_ENV=py34-djangomaster + - env: TOX_ENV=py35-djangomaster install: - pip install tox diff --git a/tox.ini b/tox.ini index ef505248b..642ad1d05 100644 --- a/tox.ini +++ b/tox.ini @@ -4,16 +4,22 @@ addopts=--tb=short [tox] envlist = py27-{lint,docs}, - {py26,py27,py32,py33,py34}-django{15,16}, - {py27,py32,py33,py34}-django{17,18,master} + {py27,py32,py33,py34}-django{17,18}, + {py27,py34,py35}-django{master} [testenv] +basepython = + py27: python2.7 + py32: python3.2 + py33: python3.3 + py34: python3.4 + py35: python3.5 + + commands = ./runtests.py --fast {posargs} --coverage setenv = PYTHONDONTWRITEBYTECODE=1 deps = - django15: Django==1.5.6 # Should track minimum supported - django16: Django==1.6.3 # Should track minimum supported django17: Django==1.7.10 # Should track maximum supported django18: Django==1.8.4 # Should track maximum supported djangomaster: https://github.com/django/django/archive/master.tar.gz