Update test runners

This commit is contained in:
James Socol 2015-05-13 10:07:55 -04:00
parent 357f17a9f8
commit f8472bcac6
2 changed files with 16 additions and 23 deletions

View File

@ -1,19 +1,18 @@
language: python language: python
sudo: false sudo: false
python: 2.6 python: 2.7
env: env:
- TOX_ENV=py26-1.4 - TOX_ENV=py26-1.4
- TOX_ENV=py26-1.5
- TOX_ENV=py26-1.6 - TOX_ENV=py26-1.6
- TOX_ENV=py27-1.4 - TOX_ENV=py27-1.4
- TOX_ENV=py27-1.5
- TOX_ENV=py27-1.6 - TOX_ENV=py27-1.6
- TOX_ENV=py27-1.7 - TOX_ENV=py27-1.7
- TOX_ENV=py27-1.8 - TOX_ENV=py27-1.8
- TOX_ENV=py33-1.5
- TOX_ENV=py33-1.6 - TOX_ENV=py33-1.6
- TOX_ENV=py33-1.7 - TOX_ENV=py33-1.7
- TOX_ENV=py33-1.8 - TOX_ENV=py33-1.8
- TOX_ENV=py34-1.7
- TOX_ENV=py34-1.8
install: install:
- pip install tox - pip install tox
script: script:

32
tox.ini
View File

@ -1,5 +1,5 @@
[tox] [tox]
envlist = py26-1.4, py26-1.5, py26-1.6, py27-1.4, py27-1.5, py27-1.6, py27-1.7, py27-1.8, py33-1.5, py33-1.6, py33-1.7, py33-1.8 envlist = py26-1.4, py26-1.6, py27-1.4, py27-1.6, py27-1.7, py27-1.8, py33-1.6, py33-1.7, py33-1.8, py34-1.7, py34-1.8
toxworkdir = {homedir}/.tox-jingo toxworkdir = {homedir}/.tox-jingo
[testenv] [testenv]
@ -17,12 +17,6 @@ deps =
Django>=1.4,<1.5 Django>=1.4,<1.5
{[testenv]deps} {[testenv]deps}
[testenv:py26-1.5]
basepython = python2.6
deps =
Django>=1.5,<1.6
{[testenv]deps}
[testenv:py26-1.6] [testenv:py26-1.6]
basepython = python2.6 basepython = python2.6
deps = deps =
@ -35,12 +29,6 @@ deps =
Django>=1.4,<1.5 Django>=1.4,<1.5
{[testenv]deps} {[testenv]deps}
[testenv:py27-1.5]
basepython = python2.7
deps =
Django>=1.5,<1.6
{[testenv]deps}
[testenv:py27-1.6] [testenv:py27-1.6]
basepython = python2.7 basepython = python2.7
deps = deps =
@ -59,12 +47,6 @@ deps =
Django>=1.8,<1.9 Django>=1.8,<1.9
{[testenv]deps} {[testenv]deps}
[testenv:py33-1.5]
basepython = python3.3
deps =
Django>=1.5,<1.6
{[testenv]deps}
[testenv:py33-1.6] [testenv:py33-1.6]
basepython = python3.3 basepython = python3.3
deps = deps =
@ -82,3 +64,15 @@ basepython = python3.3
deps = deps =
Django>=1.8,<1.9 Django>=1.8,<1.9
{[testenv]deps} {[testenv]deps}
[testenv:py34-1.7]
basepython = python3.4
deps =
Django>=1.7,<1.8
{[testenv]deps}
[testenv:py34-1.8]
basepython = python3.4
deps =
Django>=1.8,<1.9
{[testenv]deps}