Merge pull request #698 from nikolas/django19-python35

enable automated testing on django 1.9 and python 3.5

2 files changed, 23 insertions, 5 deletions

diff --git a/.travis.yml b/.travis.yml
index 9b181ff..f4d84e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ python:
   - "3.2"
   - "3.3"
   - "3.4"
+  - "3.5"
   - "pypy"
 
 env:
@@ -24,8 +25,9 @@ env:
     - DJANGO=Django==1.4.20
     - DJANGO=Django==1.5.12
     - DJANGO=Django==1.6.11
-    - DJANGO=Django==1.7.7
-    - DJANGO=Django==1.8
+    - DJANGO=Django==1.7.11
+    - DJANGO=Django==1.8.7
+    - DJANGO=Django==1.9
     - 'DJANGO="-e git+git://github.com/django/django.git#egg=Django"'
 
 install:
@@ -45,15 +47,31 @@ matrix:
   exclude:
     - python: "3.2"
       env: DJANGO=Django==1.4.20
+    - python: "3.2"
+      env: DJANGO=Django==1.9
     - python: "3.3"
       env: DJANGO=Django==1.4.20
+    - python: "3.3"
+      env: DJANGO=Django==1.9
     - python: "3.4"
       env: DJANGO=Django==1.4.20
+    - python: "3.5"
+      env: DJANGO=Django==1.4.20
+    - python: "3.5"
+      env: DJANGO=Django==1.5.12
+    - python: "3.5"
+      env: DJANGO=Django==1.6.11
+    - python: "3.5"
+      env: DJANGO=Django==1.7.11
+    - python: "3.5"
+      env: DJANGO=Django==1.8.7
     - python: "2.6"
       env: DJANGO="-e git+git://github.com/django/django.git#egg=Django"
     - python: "3.2"
       env: DJANGO="-e git+git://github.com/django/django.git#egg=Django"
     - python: "2.6"
-      env: DJANGO=Django==1.8
+      env: DJANGO=Django==1.9
+    - python: "2.6"
+      env: DJANGO=Django==1.8.7
     - python: "2.6"
-      env: DJANGO=Django==1.7.7
+      env: DJANGO=Django==1.7.11
diff --git a/tox.ini b/tox.ini
index 41d42e0..3d3cbd7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py30, py31, py32, py33, py34, pypy
+envlist = py26, py27, py30, py31, py32, py33, py34, py35, pypy
 
 [testenv]
 commands =