From 57717db0ef2355af9aac1b63eefe9900dda7998a Mon Sep 17 00:00:00 2001
From: David Lyle <david.lyle@hp.com>
Date: Mon, 3 Feb 2014 11:34:54 -0700
Subject: [PATCH] Adding Django 1.6 support

Bumping the upper version of Django to include 1.6.

Adding a tox env to maintain support for Django 1.5 and fixing
env for django 1.4

Implements blueprint django-16-support

Change-Id: I093b38f85bea1fbd7641571a3871a721abadd37c
---
 requirements.txt |  2 +-
 tox.ini          | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 635ee08..dba4684 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 pbr>=0.6,<1.0
-Django>=1.4,<1.6
+Django>=1.4,<1.7
 python-keystoneclient>=0.6.0
 six>=1.5.2
diff --git a/tox.ini b/tox.ini
index a140a2f..2453f31 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py26,py27,py27dj14,pep8,py33
+envlist = py26,py27,py27dj14,py27dj15,pep8,py33
 
 [testenv]
 usedevelop = True
@@ -16,11 +16,13 @@ deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = python openstack_auth/tests/run_tests.py
 
+[testenv:py27dj15]
+commands = pip install django>=1.5,<1.6
+           python openstack_auth/tests/run_tests.py
+
 [testenv:py27dj14]
-deps = pbr>=0.5.21,<1.0
-       Django==1.4
-       python-keystoneclient>=0.3.2
-       -r{toxinidir}/test-requirements.txt
+commands = pip install django==1.4
+           python openstack_auth/tests/run_tests.py
 
 [testenv:pep8]
 commands = flake8