From 7f22f98e906d46bee487ce2d78fb995f74c1d568 Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Tue, 12 Apr 2016 11:27:04 +0200 Subject: [PATCH] Django <1.8 does not support Python 3.5 --- .travis.yml | 5 ++--- tox.ini | 29 ++++++++++++----------------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 75ec179..c37aa07 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,13 +18,12 @@ env: - TOXENV=py33-django18 - TOXENV=py33-django18-cdecimal + - TOXENV=py34-django15 + - TOXENV=py34-django16 - TOXENV=py34-django17 - TOXENV=py34-django18 - TOXENV=py34-django18-cdecimal - - TOXENV=py35-django15 - - TOXENV=py35-django16 - - TOXENV=py35-django17 - TOXENV=py35-django18 - TOXENV=py35-django18-cdecimal diff --git a/tox.ini b/tox.ini index 438468e..fa138c9 100644 --- a/tox.ini +++ b/tox.ini @@ -4,8 +4,8 @@ envlist = py26-django11, py26-django12, py26-django13, py26-django14, py26-django15, py26-django16, py27-django14, py27-django15, py27-django16, py27-django17, py27-django18, py27-django18-cdecimal, py33-django17, py33-django18, py33-django18-cdecimal, - py34-django17, py34-django18, py34-django18-cdecimal, - py35-django15, py35-django16, py35-django17, py35-django18, py35-django18-cdecimal, + py34-django15, py34-django16, py34-django17, py34-django18, py34-django18-cdecimal, + py35-django18, py35-django18-cdecimal, pypy-django14, pypy-django15, pypy-django16, pypy-django17, pypy-django18, pypy3-django17, pypy3-django18 @@ -103,6 +103,16 @@ deps= # Python 3.4 +[testenv:py34-django15] +basepython=python3.4 +deps= + django<1.6 + +[testenv:py34-django16] +basepython=python3.4 +deps= + django<1.7 + [testenv:py34-django17] basepython=python3.4 deps= @@ -121,21 +131,6 @@ deps= # Python 3.5 -[testenv:py35-django15] -basepython=python3.5 -deps= - django<1.6 - -[testenv:py35-django16] -basepython=python3.5 -deps= - django<1.7 - -[testenv:py35-django17] -basepython=python3.5 -deps= - django<1.8 - [testenv:py35-django18] basepython=python3.5 deps=