diff --git a/tox.ini b/tox.ini index 7846007..ebcd5ee 100644 --- a/tox.ini +++ b/tox.ini @@ -1,19 +1,20 @@ [tox] envlist= - py33-django-dev, - - py33-django16, - py32-django16, - py27-django16, + py26-django14, + py26-django15, py26-django16, - py33-django15, - py32-django15, - py27-django15, - py26-django15, - py27-django14, - py26-django14, + py27-django15, + py27-django16, + + py32-django15, + py32-django16, + + py33-django15, + py33-django16, + + py33-django-dev, docs, [testenv] @@ -22,65 +23,61 @@ commands= # Build configurations - -[testenv:py33-django-dev] -basepython=python3.3 -deps= - https://github.com/django/django/archive/master.zip - - -[testenv:py33-django16] -basepython=python3.3 -deps= - django==1.6 - -[testenv:py32-django16] -basepython=python3.2 -deps= - django==1.6 - -[testenv:py27-django16] -basepython=python2.7 -deps= - django==1.6 - -[testenv:py26-django16] +[testenv:py26-django14] basepython=python2.6 deps= - django==1.6 - - -[testenv:py33-django15] -basepython=python3.3 -deps= - django==1.5 - -[testenv:py32-django15] -basepython=python3.2 -deps= - django==1.5 - -[testenv:py27-django15] -basepython=python2.7 -deps= - django==1.5 + django==1.4.5 [testenv:py26-django15] basepython=python2.6 deps= django==1.5 - -[testenv:py26-django14] +[testenv:py26-django16] basepython=python2.6 deps= - django==1.4.5 + django==1.6 [testenv:py27-django14] basepython=python2.7 deps= django==1.4.5 +[testenv:py27-django15] +basepython=python2.7 +deps= + django==1.5 + +[testenv:py27-django16] +basepython=python2.7 +deps= + django==1.6 + +[testenv:py32-django15] +basepython=python3.2 +deps= + django==1.5 + +[testenv:py32-django16] +basepython=python3.2 +deps= + django==1.6 + +[testenv:py33-django15] +basepython=python3.3 +deps= + django==1.5 + +[testenv:py33-django16] +basepython=python3.3 +deps= + django==1.6 + +[testenv:py33-django-dev] +basepython=python3.3 +deps= + https://github.com/django/django/archive/master.zip + [testenv:docs] changedir=docs deps=Sphinx