From ead787b1d3ecfc7d7a6d64038851bb98745e32a6 Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.co.uk>
Date: Mon, 21 Sep 2015 15:58:34 +0200
Subject: [PATCH] Test Python 3.5 against Django `master`

---
 .travis.yml |  9 +++++++++
 tox.ini     | 10 +++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7513b4db243..4c49e8de862 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,11 @@
 language: python
+python:
+  - "2.6"
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
 
 sudo: false
 
@@ -25,12 +32,14 @@ env:
     - TOX_ENV=py26-django15
     - TOX_ENV=py27-djangomaster
     - TOX_ENV=py34-djangomaster
+    - TOX_ENV=py35-djangomaster
 
 matrix:
   fast_finish: true
   allow_failures:
     - env: TOX_ENV=py27-djangomaster
     - env: TOX_ENV=py34-djangomaster
+    - env: TOX_ENV=py35-djangomaster
 
 install:
   - pip install tox
diff --git a/tox.ini b/tox.ini
index 89d43771adc..924d11df59d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,9 +6,17 @@ envlist =
        py27-{lint,docs},
        {py26,py27,py32,py33,py34}-django{15,16},
        {py27,py32,py33,py34}-django{17,18},
-       {py27,py34}-django{master}
+       {py27,py34,py35}-django{master}
 
 [testenv]
+basepython =
+            py26: python2.6
+            py27: python2.7
+            py32: python3.2
+            py33: python3.3
+            py34: python3.4
+            py35: python3.5
+
 commands = ./runtests.py --fast {posargs} --coverage
 setenv =
        PYTHONDONTWRITEBYTECODE=1