From 13768bc7ae86af7f1bced02adc814e3edffd43b0 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Thu, 24 Sep 2015 11:07:46 +0200
Subject: [PATCH] Fixed some Travis config issues

---
 .travis.yml | 29 ++++++++++-------------------
 tox.ini     |  2 +-
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1ea6172..db707c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,22 @@
 sudo: false
 language: python
+cache:
+    directories:
+        - $HOME/.cache/pip
 install:
   - pip install tox
 env:
-  - TOXENV=py26-django-14
-  - TOXENV=py27-django-14
-  - TOXENV=py26-django-15
-  - TOXENV=py26-django-16
-  - TOXENV=py27-django-15
-  - TOXENV=py27-django-16
-  - TOXENV=py32-django-15
-  - TOXENV=py32-django-16
-  - TOXENV=py33-django-15
-  - TOXENV=py33-django-16
-  - TOXENV=py34-django-15
-  - TOXENV=py34-django-16
-  - TOXENV=pypy-django-15
-  - TOXENV=pypy-django-16
   - TOXENV=py27-django-17
-  - TOXENV=py27-django-master
-  - TOXENV=py32-django-17
-  - TOXENV=py32-django-master
+  - TOXENV=py27-django-18
   - TOXENV=py33-django-17
-  - TOXENV=py33-django-master
+  - TOXENV=py33-django-18
   - TOXENV=py34-django-17
-  - TOXENV=py34-django-master
+  - TOXENV=py34-django-18
   - TOXENV=pypy-django-17
+  - TOXENV=pypy-django-18
+  - TOXENV=py27-django-master
+  - TOXENV=py34-django-master
+  - TOXENV=py35-django-master
   - TOXENV=pypy-django-master
 script:
   - tox
diff --git a/tox.ini b/tox.ini
index 479758d..a4ff486 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
     {py27,py33,py34,pypy}-django-{17,18},
-    {py27,py34,35,pypy}-django-{master}
+    {py27,py34,py35,pypy}-django-{master}
 
 [testenv]
 basepython =