From 8796f05ae3a2076157b0164e440c248519fe25ca Mon Sep 17 00:00:00 2001 From: Dmytro Kyrychuck Date: Tue, 27 Jan 2015 01:05:29 +0200 Subject: [PATCH] added django 1.7.3 to build matrix (fixes #152) --- .travis.yml | 3 +++ tox.ini | 24 +++++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index aa58aa0..d613163 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ env: - DJANGO=Django==1.4.18 SOUTH=1 - DJANGO=Django==1.5.12 SOUTH=1 - DJANGO=Django==1.6.10 SOUTH=1 + - DJANGO=Django==1.7.3 SOUTH=0 - DJANGO=https://github.com/django/django/tarball/master SOUTH=1 install: @@ -25,6 +26,8 @@ matrix: exclude: - python: 2.6 env: DJANGO=https://github.com/django/django/tarball/master SOUTH=1 + - python: 2.6 + env: DJANGO=Django==1.7.3 SOUTH=0 - python: 3.2 env: DJANGO=Django==1.4.18 SOUTH=1 - python: 3.3 diff --git a/tox.ini b/tox.ini index 0efa45f..9fd99cb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,9 @@ [tox] envlist = py26-1.4, py26-1.5, py26-1.6, - py27-1.4, py27-1.5, py27-1.6, py27-trunk, py27-1.5-nosouth, - py32-1.5, py32-1.6, py32-trunk, - py33-1.5, py33-1.6, py33-trunk + py27-1.4, py27-1.5, py27-1.6, py27-1.7, py27-trunk, py27-1.5-nosouth, + py32-1.5, py32-1.6, py32-1.7, py32-trunk, + py33-1.5, py33-1.6, py33-1.7, py33-trunk [testenv] deps = @@ -53,6 +53,12 @@ deps = South == 0.8.1 coverage == 3.6 +[testenv:py27-1.7] +basepython = python2.7 +deps = + Django == 1.7.3 + coverage == 3.6 + [testenv:py27-trunk] basepython = python2.7 deps = @@ -80,6 +86,12 @@ deps = South == 0.8.1 coverage == 3.6 +[testenv:py32-1.7] +basepython = python3.2 +deps = + Django == 1.7.3 + coverage == 3.6 + [testenv:py32-trunk] basepython = python3.2 deps = @@ -101,6 +113,12 @@ deps = South == 0.8.1 coverage == 3.6 +[testenv:py33-1.7] +basepython = python3.3 +deps = + Django == 1.7.3 + coverage == 3.6 + [testenv:py33-trunk] basepython = python3.3 deps =