From f8472bcac6ba206271135021b65c25db553297b7 Mon Sep 17 00:00:00 2001 From: James Socol Date: Wed, 13 May 2015 10:07:55 -0400 Subject: [PATCH] Update test runners --- .travis.yml | 7 +++---- tox.ini | 32 +++++++++++++------------------- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5eee6a0..eaa198b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,18 @@ language: python sudo: false -python: 2.6 +python: 2.7 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=py27-1.7 - TOX_ENV=py27-1.8 - - TOX_ENV=py33-1.5 - TOX_ENV=py33-1.6 - TOX_ENV=py33-1.7 - TOX_ENV=py33-1.8 + - TOX_ENV=py34-1.7 + - TOX_ENV=py34-1.8 install: - pip install tox script: diff --git a/tox.ini b/tox.ini index f05a4c6..8e4c863 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [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 [testenv] @@ -17,12 +17,6 @@ deps = Django>=1.4,<1.5 {[testenv]deps} -[testenv:py26-1.5] -basepython = python2.6 -deps = - Django>=1.5,<1.6 - {[testenv]deps} - [testenv:py26-1.6] basepython = python2.6 deps = @@ -35,12 +29,6 @@ deps = Django>=1.4,<1.5 {[testenv]deps} -[testenv:py27-1.5] -basepython = python2.7 -deps = - Django>=1.5,<1.6 - {[testenv]deps} - [testenv:py27-1.6] basepython = python2.7 deps = @@ -59,12 +47,6 @@ deps = Django>=1.8,<1.9 {[testenv]deps} -[testenv:py33-1.5] -basepython = python3.3 -deps = - Django>=1.5,<1.6 - {[testenv]deps} - [testenv:py33-1.6] basepython = python3.3 deps = @@ -82,3 +64,15 @@ basepython = python3.3 deps = Django>=1.8,<1.9 {[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}