From ea1b0dc5e6dcc0f8e4e3fa66f6f28de257f10464 Mon Sep 17 00:00:00 2001
From: Ana Krivokapic <akrivoka@redhat.com>
Date: Tue, 15 Apr 2014 13:56:48 +0200
Subject: [PATCH] Add Django 1.5 and 1.6 to tox.ini

Both Django 1.5 and 1.6 are supported and should be tested against.
This patch adds the two corresponding configurations to tox.ini.

Change-Id: I72db0a1643da17bc5c35f863cb5e3b4b81fffab8
Closes-bug: #1306074
---
 tox.ini | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index f1f3c3137..ab38aaefb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py27dj14,pep8
+envlist = py26,py27,py27dj14,py27dj15,py27dj16,pep8
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -23,7 +23,17 @@ commands = /bin/bash run_tests.sh -N --coverage
 
 [testenv:py27dj14]
 basepython = python2.7
-commands = pip install django==1.4
+commands = pip install django>=1.4,<1.5
+           /bin/bash run_tests.sh -N
+
+[testenv:py27dj15]
+basepython = python2.7
+commands = pip install django>=1.5,<1.6
+           /bin/bash run_tests.sh -N
+
+[testenv:py27dj16]
+basepython = python2.7
+commands = pip install django>=1.6,<1.7
            /bin/bash run_tests.sh -N
 
 [tox:jenkins]