diff --git a/.travis.yml b/.travis.yml index 4a7fdd42f..acd711917 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,11 +13,6 @@ 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=py27-djangomaster - TOX_ENV=py34-djangomaster - TOX_ENV=py35-djangomaster diff --git a/tox.ini b/tox.ini index 204a68457..0d3836ff2 100644 --- a/tox.ini +++ b/tox.ini @@ -4,13 +4,11 @@ addopts=--tb=short [tox] envlist = py27-{lint,docs}, - {py26,py27,py32,py33,py34}-django16, {py27,py32,py33,py34}-django{17,18}, {py27,py34,py35}-django{master} [testenv] basepython = - py26: python2.6 py27: python2.7 py32: python3.2 py33: python3.3 @@ -21,7 +19,6 @@ commands = ./runtests.py --fast {posargs} --coverage setenv = PYTHONDONTWRITEBYTECODE=1 deps = - 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