Merge pull request #99 from jdufresne/test-matrix

Complete the test matrix for all supported Python/Django versions

Author: knaperek

.travis.yml

@@ -1,22 +1,43 @@
 language: python
 
-python:
-    - "2.7"
-    - "3.5"
-
 sudo: false
 
-env:
-    - TOX_ENV=django18
-    - TOX_ENV=django19
-    - TOX_ENV=django110
-    - TOX_ENV=django111
-    - TOX_ENV=djangomaster
-
 matrix:
-    fast_finish: true
-    allow_failures:
-      - env: TOX_ENV=djangomaster
+  include:
+    - python: 2.7
+      env: TOX_ENV=py27-django18
+    - python: 3.3
+      env: TOX_ENV=py33-django18
+    - python: 3.4
+      env: TOX_ENV=py34-django18
+    - python: 2.7
+      env: TOX_ENV=py27-django19
+    - python: 3.4
+      env: TOX_ENV=py34-django19
+    - python: 3.5
+      env: TOX_ENV=py35-django19
+    - python: 2.7
+      env: TOX_ENV=py27-django110
+    - python: 3.4
+      env: TOX_ENV=py34-django110
+    - python: 3.5
+      env: TOX_ENV=py35-django110
+    - python: 2.7
+      env: TOX_ENV=py27-django111
+    - python: 3.4
+      env: TOX_ENV=py34-django111
+    - python: 3.5
+      env: TOX_ENV=py35-django111
+    - python: 3.6
+      env: TOX_ENV=py36-django111
+    - python: 3.5
+      env: TOX_ENV=py35-djangomaster
+    - python: 3.6
+      env: TOX_ENV=py36-djangomaster
+  fast_finish: true
+  allow_failures:
+    - env: TOX_ENV=py35-djangomaster
+    - env: TOX_ENV=py36-djangomaster
 
 addons:
   apt:

setup.py

@@ -41,7 +41,10 @@ def read(*rnames):
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI",
         "Topic :: Security",

tox.ini

@@ -1,5 +1,10 @@
 [tox]
-envlist = py27-django{18,19,110,111}, py36-django{18,19,110,111,master}
+envlist =
+    py{27,33,34,35}-django18
+    py{27,34,35}-django19
+    py{27,34,35}-django110
+    py{27,34,35,36}-django111
+    py{35,36}-djangomaster
 
 [testenv]
 commands =
@@ -11,3 +16,6 @@ deps =
     django110: Django>=1.10,<1.11
     django111: Django>=1.11,<2.0
     djangomaster: https://github.com/django/django/archive/master.tar.gz
+
+ignore_outcome =
+    djangomaster: True