diff --git a/.travis.yml b/.travis.yml index aa80c77..56ef182 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,11 @@ language: python env: - - TOX_ENV=py26-1.4 - TOX_ENV=py26-1.5 - TOX_ENV=py26-1.6 - - TOX_ENV=py27-1.4 - TOX_ENV=py27-1.5 - TOX_ENV=py27-1.6 - - TOX_ENV=pypy-1.4 + - TOX_ENV=py33-1.5 + - TOX_ENV=py33-1.6 - TOX_ENV=pypy-1.5 - TOX_ENV=pypy-1.6 before_install: diff --git a/django_mobile_tests/settings.py b/django_mobile_tests/settings.py index ef1eead..b552645 100644 --- a/django_mobile_tests/settings.py +++ b/django_mobile_tests/settings.py @@ -65,7 +65,6 @@ 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.middleware.doc.XViewMiddleware', 'django_mobile.middleware.MobileDetectionMiddleware', 'django_mobile.middleware.SetFlavourMiddleware', ) diff --git a/tox.ini b/tox.ini index de5cf4a..8e197ea 100644 --- a/tox.ini +++ b/tox.ini @@ -1,20 +1,16 @@ [tox] envlist = - py26-1.4, py26-1.5, py26-1.6, - py27-1.4, py27-1.5, py27-1.6, py27-trunk, - pypy-1.4, pypy-1.5, pypy-1.6, pypy-trunk + py26-1.5, py26-1.6, + py27-1.5, py27-1.6, py27-trunk, + py27-1.5, py27-1.6, py27-trunk, + py33-1.5, py33-1.6, py33-trunk, + pypy-1.5, pypy-1.6, pypy-trunk [testenv] commands = python django_mobile_tests/runtests.py setenv = DJANGO_SETTINGS_MODULE = django_mobile_tests.settings -[testenv:py26-1.4] -basepython = python2.6 -deps = - Django >= 1.4, < 1.4.99 - -r{toxinidir}/requirements/tests.txt - [testenv:py26-1.5] basepython = python2.6 deps = @@ -27,12 +23,6 @@ deps = Django >= 1.6, < 1.6.99 -r{toxinidir}/requirements/tests.txt -[testenv:py27-1.4] -basepython = python2.7 -deps = - Django >= 1.4, < 1.4.99 - -r{toxinidir}/requirements/tests.txt - [testenv:py27-1.5] basepython = python2.7 deps = @@ -51,10 +41,22 @@ deps = https://github.com/django/django/tarball/master#egg=Django -r{toxinidir}/requirements/tests.txt -[testenv:pypy-1.4] -basepython = pypy +[testenv:py33-1.5] +basepython = python3.3 deps = - Django >= 1.4, < 1.4.99 + Django >= 1.5, < 1.5.99 + -r{toxinidir}/requirements/tests.txt + +[testenv:py33-1.6] +basepython = python3.3 +deps = + Django >= 1.6, < 1.6.99 + -r{toxinidir}/requirements/tests.txt + +[testenv:py33-trunk] +basepython = python3.3 +deps = + https://github.com/django/django/tarball/master#egg=Django -r{toxinidir}/requirements/tests.txt [testenv:pypy-1.5]