From 134e0450c09ec1668dbede1292784b51705f5361 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Tue, 15 Sep 2015 13:32:10 +0200 Subject: [PATCH 1/5] Remove Python 3.2 and 3.3. from Django 1.9 tests https://docs.djangoproject.com/en/dev/releases/1.9/ --- .travis.yml | 4 ---- tox.ini | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 87db5e046..7513b4db2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,16 +24,12 @@ env: - TOX_ENV=py27-django15 - TOX_ENV=py26-django15 - TOX_ENV=py27-djangomaster - - TOX_ENV=py32-djangomaster - - TOX_ENV=py33-djangomaster - TOX_ENV=py34-djangomaster matrix: fast_finish: true allow_failures: - env: TOX_ENV=py27-djangomaster - - env: TOX_ENV=py32-djangomaster - - env: TOX_ENV=py33-djangomaster - env: TOX_ENV=py34-djangomaster install: diff --git a/tox.ini b/tox.ini index ef505248b..89d43771a 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,8 @@ addopts=--tb=short envlist = py27-{lint,docs}, {py26,py27,py32,py33,py34}-django{15,16}, - {py27,py32,py33,py34}-django{17,18,master} + {py27,py32,py33,py34}-django{17,18}, + {py27,py34}-django{master} [testenv] commands = ./runtests.py --fast {posargs} --coverage From f3f6b3570a95cc7ac62840fef7911f8ea6be01d2 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Tue, 15 Sep 2015 14:02:30 +0200 Subject: [PATCH 2/5] Add Python 3.5 against Django 1.9 --- tox.ini | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 89d43771a..dc0388ccd 100644 --- a/tox.ini +++ b/tox.ini @@ -6,9 +6,13 @@ envlist = py27-{lint,docs}, {py26,py27,py32,py33,py34}-django{15,16}, {py27,py32,py33,py34}-django{17,18}, - {py27,py34}-django{master} + {py27,py34,py35}-django{master} [testenv] +basepython = + py35: python3.5 + + commands = ./runtests.py --fast {posargs} --coverage setenv = PYTHONDONTWRITEBYTECODE=1 From cfbefbd5e470761c5b79b657f9669e5bea208d5d Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Tue, 15 Sep 2015 14:03:23 +0200 Subject: [PATCH 3/5] Add Python 3.5 testing to Travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7513b4db2..a714b8013 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,12 +25,14 @@ env: - TOX_ENV=py26-django15 - TOX_ENV=py27-djangomaster - TOX_ENV=py34-djangomaster + - TOX_ENV=py35-djangomaster matrix: fast_finish: true allow_failures: - env: TOX_ENV=py27-djangomaster - env: TOX_ENV=py34-djangomaster + - env: TOX_ENV=py35-djangomaster install: - pip install tox From 2c2dfc6d0186f57f7a5def1047420744232dae8e Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Tue, 15 Sep 2015 14:18:18 +0200 Subject: [PATCH 4/5] Set basepython for all envs --- tox.ini | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index dc0388ccd..de61fdbdf 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,12 @@ envlist = [testenv] basepython = - py35: python3.5 + py26: python2.6 + py27: python2.7 + py32: python3.2 + py33: python3.3 + py34: python3.4 + py35: python3.5 commands = ./runtests.py --fast {posargs} --coverage From 2c3452162c16bd0c4f50e08609b940d701cf3390 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Tue, 15 Sep 2015 14:34:20 +0200 Subject: [PATCH 5/5] Remove testing against Django 1.5 and 1.6 --- .travis.yml | 10 ---------- tox.ini | 4 ---- 2 files changed, 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index a714b8013..acd711917 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,16 +13,6 @@ env: - TOX_ENV=py33-django17 - TOX_ENV=py32-django17 - TOX_ENV=py27-django17 - - TOX_ENV=py34-django16 - - TOX_ENV=py33-django16 - - TOX_ENV=py32-django16 - - TOX_ENV=py27-django16 - - TOX_ENV=py26-django16 - - TOX_ENV=py34-django15 - - TOX_ENV=py33-django15 - - TOX_ENV=py32-django15 - - TOX_ENV=py27-django15 - - TOX_ENV=py26-django15 - TOX_ENV=py27-djangomaster - TOX_ENV=py34-djangomaster - TOX_ENV=py35-djangomaster diff --git a/tox.ini b/tox.ini index de61fdbdf..642ad1d05 100644 --- a/tox.ini +++ b/tox.ini @@ -4,13 +4,11 @@ addopts=--tb=short [tox] envlist = py27-{lint,docs}, - {py26,py27,py32,py33,py34}-django{15,16}, {py27,py32,py33,py34}-django{17,18}, {py27,py34,py35}-django{master} [testenv] basepython = - py26: python2.6 py27: python2.7 py32: python3.2 py33: python3.3 @@ -22,8 +20,6 @@ commands = ./runtests.py --fast {posargs} --coverage setenv = PYTHONDONTWRITEBYTECODE=1 deps = - django15: Django==1.5.6 # Should track minimum supported - django16: Django==1.6.3 # Should track minimum supported django17: Django==1.7.10 # Should track maximum supported django18: Django==1.8.4 # Should track maximum supported djangomaster: https://github.com/django/django/archive/master.tar.gz