diff --git a/.travis.yml b/.travis.yml index ad50d3a..0cb5360 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,12 @@ env: - TOX_ENV=py27-1.4 - TOX_ENV=py27-1.5 - TOX_ENV=py27-1.6 + - TOX_ENV=py27-1.7 - TOX_ENV=py33-1.5 - TOX_ENV=py33-1.6 + - TOX_ENV=py33-1.7 + - TOX_ENV=py34-1.6 + - TOX_ENV=py34-1.7 install: - pip install tox script: diff --git a/tox.ini b/tox.ini index d5c130c..9eed9b2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,12 @@ [tox] -envlist = py26-1.4, py26-1.5, py26-1.6, py27-1.4, py27-1.5, py27-1.6, py33-1.5, py33-1.6 +envlist = py26-1.4, py26-1.5, py26-1.6, py27-1.4, py27-1.5, py27-1.6, py27-1.7, py33-1.5, py33-1.6, py33-1.7, py34-1.6, py34-1.7 toxworkdir = {homedir}/.tox-jingo [testenv] commands = python run_tests.py deps = - sphinx - jinja2==2.7 + jinja2>=2.7 nose mock @@ -48,6 +47,12 @@ deps = Django>=1.6,<1.7 {[testenv]deps} +[testenv:py27-1.7] +basepython = python2.7 +deps = + https://github.com/django/django/archive/1.7b4.zi + {[testenv]deps} + [testenv:py33-1.5] basepython = python3.3 deps = @@ -59,3 +64,21 @@ basepython = python3.3 deps = Django>=1.6,<1.7 {[testenv]deps} + +[testenv:py33-1.7] +basepython = python3.3 +deps = + https://github.com/django/django/archive/1.7b4.zi + {[testenv]deps} + +[testenv:py34-1.6] +basepython = python3.4 +deps = + Django>=1.6,<1.7 + {[testenv]deps} + +[testenv:py34-1.7] +basepython = python3.4 +deps = + https://github.com/django/django/archive/1.7b4.zi + {[testenv]deps}