Merge pull request #46 from ticosax/django-2.0

Bring django2.0 support

Author: ticosax

.travis.yml

@@ -1,28 +1,52 @@
 language: python
-env:
-    - TOX_ENV=py27-dj-1.6
-    - TOX_ENV=py27-dj-1.7
-    - TOX_ENV=py27-dj-1.8
-    - TOX_ENV=py27-dj-1.9
-    - TOX_ENV=py27-dj-master
-    - TOX_ENV=py33-dj-1.6
-    - TOX_ENV=py33-dj-1.7
-    - TOX_ENV=py33-dj-1.8
-    - TOX_ENV=py34-dj-1.6
-    - TOX_ENV=py34-dj-1.7
-    - TOX_ENV=py34-dj-1.8
-    - TOX_ENV=py34-dj-1.9
-    - TOX_ENV=py34-dj-master
-    - TOX_ENV=py35-dj-1.9
-    - TOX_ENV=py35-dj-master
 
 matrix:
+    include:
+        - env: TOXENV=py27-dj-1.8
+          python: 2.7
+        - env: TOXENV=py27-dj-1.10
+          python: 2.7
+        - env: TOXENV=py27-dj-1.11
+          python: 2.7
+        - env: TOXENV=py34-dj-1.8
+          python: 3.4
+        - env: TOXENV=py34-dj-1.10
+          python: 3.4
+        - env: TOXENV=py34-dj-1.11
+          python: 3.4
+        - env: TOXENV=py35-dj-1.8
+          python: 3.5
+        - env: TOXENV=py35-dj-1.10
+          python: 3.5
+        - env: TOXENV=py35-dj-1.11
+          python: 3.5
+        - env: TOXENV=py36-dj-1.8
+          python: 3.6
+        - env: TOXENV=py36-dj-1.10
+          python: 3.6
+        - env: TOXENV=py36-dj-1.11
+          python: 3.6
+        - env: TOXENV=py34-dj-2.0
+          python: 3.4
+        - env: TOXENV=py34-dj-master
+          python: 3.4
+        - env: TOXENV=py35-dj-2.0
+          python: 3.5
+        - env: TOXENV=py35-dj-master
+          python: 3.5
+        - env: TOXENV=py36-dj-2.0
+          python: 3.6
+        - env: TOXENV=py36-dj-master
+          python: 3.6
     allow_failures:
-        - env: TOX_ENV=py27-dj-master
-        - env: TOX_ENV=py34-dj-master
-        - env: TOX_ENV=py35-dj-master
+        - env: TOXENV=py34-dj-master
+          python: 3.4
+        - env: TOXENV=py35-dj-master
+          python: 3.5
+        - env: TOXENV=py36-dj-master
+          python: 3.6
 
 install:
     - pip install tox
 
-script: tox -e $TOX_ENV
+script: tox

tox.ini

@@ -1,14 +1,14 @@
 [tox]
 envlist =
-    {py27,py33,py34,py35}-dj-{1.6,1.7,1.8,1.9,master}
+    py{27,34,35,36}-dj-{1.8,1.10,1.11}
+    py{34,35,36}-dj-{2.0,master}
 
 [testenv]
 commands = ./runtests.py
 deps =
-    dj-1.6: Django==1.6.11
-    dj-1.6: South==1.0.2
-    dj-1.7: Django==1.7.11
-    dj-1.8: Django==1.8.7
-    dj-1.9: Django==1.9
+    dj-1.8: Django>=1.8,<1.9
+    dj-1.10: Django>=1.10,<1.11
+    dj-1.11: Django>=1.11,<2.0
+    dj-2.0: Django>=2.0a1,<2.1
     dj-master: https://github.com/django/django/archive/master.tar.gz
     mock