Merge pull request #29 from raiderrobert/travis-rework

Reworked travis and tox a lot

Author: raiderrobert

.travis.yml

@@ -1,28 +1,16 @@
 language: python
 
-sudo: false
-
-cache: pip
-
-env:
-  - DJANGO='django>=1.11.0,<2.0.0'
-  - DJANGO='django>=1.10.0,<1.11.0'
-  - DJANGO='django>=1.9.0,<1.10.0'
-  - DJANGO='django>=1.8.0,<1.9.0'
-
 python:
     - "2.7"
     - "3.4"
     - "3.5"
     - "3.6"
-    - "nightly"
-
-script: python tests.py
 
 install:
-  - travis_retry pip install $DJANGO
-  - travis_retry pip install coveralls
-  - travis_retry pip install -r requirements.txt
+  - pip install tox-travis python-coveralls
+
+script:
+  - tox
 
 after_success:
-    - coveralls
+    coveralls

tox.ini

@@ -1,20 +1,28 @@
 [tox]
-envlist = {py34,py35,py36}-django20, {py27,py35,py36}-django110, {py27,py34,py35,py36}-django19, {py27,py32,py33,py34,py35,py36}-django18, {py27,py32,py33,py34}-django17
+args_are_paths = false
+envlist = 
+    py27-{1.11},
+    py34-{1.11,2.0},
+    py35-{1.11,2.0,master},
+    py36-{2.0,master}
+
+
+[travis]
+python:
+    2.7: py27
+    3.6: py36
 
 [testenv]
 commands = python tests.py
 basepython =
     py27: python2.7
-    py32: python3.2
-    py33: python3.3
     py34: python3.4
     py35: python3.5
     py36: python3.6
-deps=
-    pytest
-    django17: Django>=1.7,<1.8
-    django18: Django>=1.8,<1.9
-    django19: Django>=1.9,<1.10
-    django110: Django>=1.10,<1.11
-    django111: Django>=1.11,<2.0
-    django20: Django>=2.0
+deps =
+    1.11: Django>=1.11,<2.0
+    2.0: Django>=2.0,<2.1
+    master: https://github.com/django/django/archive/master.tar.gz
+usedevelop = true
+pip_pre = true
+setenv = PYTHONPATH={toxinidir}