From 4d9887af4664c10ea7b98aa0beb3816f3903dd0d Mon Sep 17 00:00:00 2001
From: Jon Cotton <jc@finaltransfer.net>
Date: Fri, 5 Sep 2014 20:03:28 -0700
Subject: [PATCH] Tox and TravisCI for Django 1.7

---
 .travis.yml | 11 ++++++++---
 tox.ini     |  7 ++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e04f936..d56d5d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,17 @@ install:
   - pip install .
   - pip install coverage coveralls Django==$DJANGO_VERSION
 env:
-  - DJANGO_VERSION=1.6.5
-  - DJANGO_VERSION=1.5.8
-  - DJANGO_VERSION=1.4.13
+  - DJANGO_VERSION=1.7
+  - DJANGO_VERSION=1.6.7
+  - DJANGO_VERSION=1.5.10
+  - DJANGO_VERSION=1.4.15
   - DJANGO_VERSION=1.3.7
 script: coverage run -m armstrong.dev.dev_django test
 after_success: coveralls
+matrix:
+  exclude:
+    - python: 2.6
+      env: DJANGO_VERSION=1.7
 notifications:
   email: false
   irc:
diff --git a/tox.ini b/tox.ini
index 66da698..d64f5e5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@
 [tox]
 envlist =
     py26_dj13, py26_dj14, py26_dj15, py26_dj16,
-    py27_dj13, py27_dj14, py27_dj15, py27_dj16
+    py27_dj13, py27_dj14, py27_dj15, py27_dj16, py27_dj17
 
 [testenv]
 basepython = python2.7
@@ -63,3 +63,8 @@ deps =
 deps =
     {[common]deps}
     Django<1.7
+
+[testenv:py27_dj17]
+deps =
+    {[common]deps}
+    Django<1.8