From 17daa4112bd3f04020e6c294ee4e06ce54b8aec2 Mon Sep 17 00:00:00 2001
From: Tim Heap <tim@timheap.me>
Date: Wed, 16 Sep 2015 13:50:12 +1000
Subject: [PATCH] Add Python 3.5 to tox.ini, travis.yml

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

diff --git a/.travis.yml b/.travis.yml
index 27a814971..a912ddbed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,14 @@ matrix:
    - env: TOXENV=py34-dj18-postgres
    - env: TOXENV=py34-dj18-sqlite
    - env: TOXENV=py34-dj18-mysql
+   - env: TOXENV=py35-dj18-postgres
+     python: 3.5
+   - env: TOXENV=py35-dj18-sqlite
+     python: 3.5
+   - env: TOXENV=py35-dj18-mysql
+     python: 3.5
+  allow_failures:
+    - python: 3.5
 
 # Services
 services:
diff --git a/tox.ini b/tox.ini
index bcf8bd6b3..eb5f94267 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 skipsdist = True
 usedevelop = True
 
-envlist = py{27,33,34}-dj{17,18}-{sqlite,postgres,mysql}, flake8
+envlist = py{27,33,34,35}-dj{17,18}-{sqlite,postgres,mysql}, flake8
 
 [flake8]
 ignore = E501,E128,E261,E302,E303,E124,E126
@@ -15,6 +15,7 @@ basepython =
     py27: python2.7
     py33: python3.3
     py34: python3.4
+    py35: python3.5
 
 deps =
     django-compressor>=1.4