From b8aa694d0769cec3a9990c1b3ae1b91353fbac6a Mon Sep 17 00:00:00 2001 From: Eric Amador Date: Sat, 18 Apr 2015 00:22:11 -0400 Subject: [PATCH] Updating tox file for python 3.3 and 3.4. Removing unused targets. --- tox.ini | 62 ++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/tox.ini b/tox.ini index 60765da..fd5e4e0 100644 --- a/tox.ini +++ b/tox.ini @@ -2,47 +2,35 @@ envlist = py2.6-django1.4,py2.6-django1.5,py2.6-django1.6, py2.7-django1.4,py2.7-django1.5,py2.7-django1.6, - py2.7-django1.7 + py2.7-django1.7, + py3.3-django1.4,py3.3-django1.5,py3.3-django1.6, + py3.3-django1.7, + py3.4-django1.4,py3.4-django1.5,py3.4-django1.6, + py3.4-django1.7, [testenv] commands = python -Wall setup.py test -[testenv:py2.6-django1.2] -basepython = python2.6 -deps = Django>=1.2,<1.3 - -[testenv:py2.6-django1.3] -basepython = python2.6 -deps = Django>=1.3,<1.4 - [testenv:py2.6-django1.4] basepython = python2.6 deps = Django>=1.4,<1.5 -[testenv:py2.7-django1.2] -basepython = python2.7 -deps = Django>=1.2,<1.3 - -[testenv:py2.7-django1.3] -basepython = python2.7 -deps = Django>=1.3,<1.4 - -[testenv:py2.7-django1.4] -basepython = python2.7 -deps = Django>=1.4,<1.5 - [testenv:py2.6-django1.5] basepython = python2.6 deps = Django>=1.5,<1.6 -[testenv:py2.7-django1.5] -basepython = python2.7 -deps = Django>=1.5,<1.6 - [testenv:py2.6-django1.6] basepython = python2.6 deps = Django>=1.6,<1.7 +[testenv:py2.7-django1.4] +basepython = python2.7 +deps = Django>=1.4,<1.5 + +[testenv:py2.7-django1.5] +basepython = python2.7 +deps = Django>=1.5,<1.6 + [testenv:py2.7-django1.6] basepython = python2.7 deps = Django>=1.6,<1.7 @@ -50,3 +38,27 @@ deps = Django>=1.6,<1.7 [testenv:py2.7-django1.7] basepython = python2.7 deps = Django>=1.7,<1.8 + +[testenv:py3.3-django1.5] +basepython = python3.3 +deps = Django>=1.7,<1.8 + +[testenv:py3.3-django1.6] +basepython = python3.3 +deps = Django>=1.6,<1.7 + +[testenv:py3.3-django1.7] +basepython = python3.3 +deps = Django>=1.7,<1.8 + +[testenv:py3.4-django1.5] +basepython = python3.4 +deps = Django>=1.7,<1.8 + +[testenv:py3.4-django1.6] +basepython = python3.4 +deps = Django>=1.6,<1.7 + +[testenv:py3.4-django1.7] +basepython = python3.4 +deps = Django>=1.7,<1.8