From 3a1a88bd159e26ca854a2e23751fa5997146df82 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Wed, 30 Sep 2015 01:10:02 +0200
Subject: [PATCH] Travis: use Python 3.5 for Python 3 flake8 test

---
 .travis.yml            | 68 +++++++++++++++++++++---------------------
 tests/requirements.txt |  2 +-
 tox.ini                |  8 +++--
 3 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 659512e..e4c8904 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,40 +8,40 @@ env:
   - PIP_WHEEL_DIR=$HOME/.cache/pip/wheels
   - PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels
   matrix:
-  - TOXENV=flake8-py27
-  - TOXENV=flake8-py33
-  - TOXENV=py26-dj14
-  - TOXENV=py26-dj15
-  - TOXENV=py26-dj16
-  - TOXENV=pypy-dj14
-  - TOXENV=pypy-dj15
-  - TOXENV=pypy-dj16
-  - TOXENV=py27-dj14
-  - TOXENV=py27-dj15
-  - TOXENV=py27-dj16
-  - TOXENV=py27-dj17
-  - TOXENV=py27-dj18
-  - TOXENV=py27-dj19
-  - TOXENV=py32-dj15
-  - TOXENV=py32-dj16
-  - TOXENV=py32-dj17
-  - TOXENV=py32-dj18
-  - TOXENV=py32-dj19
-  - TOXENV=py33-dj15
-  - TOXENV=py33-dj16
-  - TOXENV=py33-dj17
-  - TOXENV=py33-dj18
-  - TOXENV=py33-dj19
-  - TOXENV=py34-dj15
-  - TOXENV=py34-dj16
-  - TOXENV=py34-dj17
-  - TOXENV=py34-dj18
-  - TOXENV=py34-dj19
-  - TOXENV=pypy-dj15
-  - TOXENV=pypy-dj16
-  - TOXENV=pypy-dj17
-  - TOXENV=pypy-dj18
-  - TOXENV=pypy-dj19
+    - TOXENV=flake8-py27
+    - TOXENV=flake8-py35
+    - TOXENV=py26-dj14
+    - TOXENV=py26-dj15
+    - TOXENV=py26-dj16
+    - TOXENV=pypy-dj14
+    - TOXENV=pypy-dj15
+    - TOXENV=pypy-dj16
+    - TOXENV=py27-dj14
+    - TOXENV=py27-dj15
+    - TOXENV=py27-dj16
+    - TOXENV=py27-dj17
+    - TOXENV=py27-dj18
+    - TOXENV=py27-dj19
+    - TOXENV=py32-dj15
+    - TOXENV=py32-dj16
+    - TOXENV=py32-dj17
+    - TOXENV=py32-dj18
+    - TOXENV=py32-dj19
+    - TOXENV=py33-dj15
+    - TOXENV=py33-dj16
+    - TOXENV=py33-dj17
+    - TOXENV=py33-dj18
+    - TOXENV=py33-dj19
+    - TOXENV=py34-dj15
+    - TOXENV=py34-dj16
+    - TOXENV=py34-dj17
+    - TOXENV=py34-dj18
+    - TOXENV=py34-dj19
+    - TOXENV=pypy-dj15
+    - TOXENV=pypy-dj16
+    - TOXENV=pypy-dj17
+    - TOXENV=pypy-dj18
+    - TOXENV=pypy-dj19
 install:
 - pip wheel -r tests/requirements.txt
 - pip install tox
diff --git a/tests/requirements.txt b/tests/requirements.txt
index e231ad5..5eb9697 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -4,5 +4,5 @@ mock
 dj-database-url
 dj-email-url
 dj-search-url
-django-cache-url>=0.6.0
+django-cache-url>=1.0.0
 six
diff --git a/tox.ini b/tox.ini
index 480cb91..24723c1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,10 +4,11 @@ usedevelop = True
 minversion = 1.8
 envlist =
     flake8-py27,
-    flake8-py33,
+    flake8-py35,
     py{26,py}-dj{14,15,16},
     py27-dj{14,15,16,17,18,19},
-    py{32,33,34,py}-dj{15,16,17,18,19}
+    py{32,33,34,py}-dj{15,16,17,18}
+    py{34,35,py]-dj{19,master}}
 
 [testenv]
 basepython =
@@ -16,6 +17,7 @@ basepython =
     py32: python3.2
     py33: python3.3
     py34: python3.4
+    py35: python3.5
     pypy: pypy
 usedevelop = true
 setenv =
@@ -48,7 +50,7 @@ commands = {envbindir}/django-cadmin test -v2 {posargs:tests}
 commands = flake8 configurations
 deps = flake8
 
-[testenv:flake8-py33]
+[testenv:flake8-py35]
 commands = flake8 configurations
 deps = flake8