From 3e417d0357ca446fb9ba91d6aedec9be96c1b0b3 Mon Sep 17 00:00:00 2001
From: Craig Bruce <craig@eyesopen.com>
Date: Fri, 5 Sep 2014 11:42:31 -0700
Subject: [PATCH] added Django 1.7 to tox and travis

---
 .travis.yml | 5 +++++
 tox.ini     | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 839b3e1..e049309 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,11 @@ env:
 - DJANGO="Django>=1.4,<1.5"
 - DJANGO="Django>=1.5,<1.6"
 - DJANGO="Django>=1.6,<1.7"
+- DJANGO="Django>=1.7,<1.8"
+matrix:
+  exclude:
+    - python: "2.6"
+      env: DJANGO="Django>=1.7,<1.8"
 install:
 - pip install $DJANGO
 script:
diff --git a/tox.ini b/tox.ini
index 6f705c5..60765da 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,8 @@
 [tox]
 envlist =
         py2.6-django1.4,py2.6-django1.5,py2.6-django1.6,
-        py2.7-django1.4,py2.7-django1.5,py2.7-django1.6
+        py2.7-django1.4,py2.7-django1.5,py2.7-django1.6,
+        py2.7-django1.7
 
 [testenv]
 commands = python -Wall setup.py test
@@ -45,3 +46,7 @@ deps = Django>=1.6,<1.7
 [testenv:py2.7-django1.6]
 basepython = python2.7
 deps = Django>=1.6,<1.7
+
+[testenv:py2.7-django1.7]
+basepython = python2.7
+deps = Django>=1.7,<1.8