From 30eb88fbdbba4d9debe90a6cbb3ca8d86deacd01 Mon Sep 17 00:00:00 2001
From: Diederik van der Boor <vdboor@edoburu.nl>
Date: Mon, 22 Sep 2014 15:01:03 +0200
Subject: [PATCH] Travis and tox: add Django 1.7

---
 .travis.yml |  3 +++
 tox.ini     | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 17b28a9..78118db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ env:
   - DJANGO=django==1.4.5
   - DJANGO=django==1.5
   - DJANGO=django==1.6
+  - DJANGO=django==1.7
   #- DJANGO=https://github.com/django/django/archive/stable/1.6.x.zip
 
 matrix:
@@ -16,6 +17,8 @@ matrix:
     env: DJANGO=django==1.4.5
   - python: "3.2"
     env: DJANGO=django==1.4.5
+  - python: "2.6"
+    env: DJANGO=django==1.7
 
 install:
   - pip install $DJANGO coverage==3.6
diff --git a/tox.ini b/tox.ini
index ebcd5ee..f69b3cd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,12 +7,14 @@ envlist=
     py27-django14,
     py27-django15,
     py27-django16,
+    py27-django17,
 
     py32-django15,
     py32-django16,
 
     py33-django15,
     py33-django16,
+    py33-django17,
 
     py33-django-dev,
     docs,
@@ -53,6 +55,11 @@ basepython=python2.7
 deps=
     django==1.6
 
+[testenv:py27-django17]
+basepython=python2.7
+deps=
+    django==1.7
+
 [testenv:py32-django15]
 basepython=python3.2
 deps=
@@ -73,6 +80,11 @@ basepython=python3.3
 deps=
     django==1.6
 
+[testenv:py33-django17]
+basepython=python3.3
+deps=
+    django==1.7
+
 [testenv:py33-django-dev]
 basepython=python3.3
 deps=