From 933ebd0846624bcf6351eda9ae819e9d6de5017d Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.co.uk>
Date: Wed, 16 Sep 2015 16:06:14 +0200
Subject: [PATCH] Remove Django 1.5 and 1.6 from tox and travis

---
 .travis.yml | 6 ------
 tox.ini     | 5 +----
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 089f0ec..8dfa4e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,13 +6,7 @@ script:
   - tox
 env:
   - TOXENV=py26-1.4.X
-  - TOXENV=py26-1.5.X
   - TOXENV=py27-1.4.X
-  - TOXENV=py27-1.5.X
-  - TOXENV=py26-1.6.X
-  - TOXENV=py27-1.6.X
-  - TOXENV=py32-1.6.X
-  - TOXENV=py33-1.6.X
   - TOXENV=py27-1.7.X
   - TOXENV=py32-1.7.X
   - TOXENV=py33-1.7.X
diff --git a/tox.ini b/tox.ini
index 550ed68..3e165a3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -43,8 +43,7 @@ three_two =
     coffin==0.4.0
 [tox]
 envlist =
-    {py26,py27}-{1.4.X,1.5.X},
-    {py26,py27,py32,py33}-{1.6.X},
+    {py26,py27}-1.4.X,
     {py27,py32,py33,py34}-{1.7.X},
     {py27,py32,py33,py34}-{1.8.X}
 [testenv]
@@ -64,8 +63,6 @@ commands =
     make test
 deps =
     1.4.X: Django>=1.4,<1.5
-    1.5.X: Django>=1.5,<1.6
-    1.6.X: Django>=1.6,<1.7
     1.7.X: Django>=1.7,<1.8
     1.8.X: Django>=1.8,<1.9
     py26: {[deps]two_six}