From 54a4c67a076a75f5939bdfab66187dc29a02bcc2 Mon Sep 17 00:00:00 2001
From: Joost Cassee <joost@cassee.net>
Date: Tue, 29 Apr 2014 01:14:04 +0200
Subject: [PATCH] Add Django 1.6 to Tox environments

---
 tox.ini | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/tox.ini b/tox.ini
index dc14e37..8e76130 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,7 @@
 [tox]
 envlist =
-        py2.6-django1.2,py2.6-django1.3,py2.6-django1.4,
-        py2.7-django1.2,py2.7-django1.3,py2.7-django1.4,
-        py2.6-django1.5,py2.7-django1.5
+        py2.6-django1.2,py2.6-django1.3,py2.6-django1.4,py2.6-django1.5,py2.6-django1.6
+        py2.7-django1.2,py2.7-django1.3,py2.7-django1.4,py2.7-django1.5,py2.7-django1.6
 
 [testenv]
 commands = python -Wall setup.py test
@@ -37,4 +36,12 @@ deps = Django>=1.5,<1.6
 
 [testenv:py2.7-django1.5]
 basepython = python2.7
-deps = Django>=1.5,<1.6
\ No newline at end of file
+deps = Django>=1.5,<1.6
+
+[testenv:py2.6-django1.6]
+basepython = python2.6
+deps = Django>=1.6,<1.7
+
+[testenv:py2.7-django1.6]
+basepython = python2.7
+deps = Django>=1.6,<1.7