Add Python-Django compatibility matrix to tox config;

test Django 2.0 also.

Author: andreif

.travis.yml

@@ -17,18 +17,20 @@ env:
     - TOXENV=py34-django19
     - TOXENV=py34-django110
     - TOXENV=py34-django111
+    - TOXENV=py34-django20
 
     - TOXENV=py35-django18
     - TOXENV=py35-django19
     - TOXENV=py35-django110
     - TOXENV=py35-django111
+    - TOXENV=py35-django20
 
 matrix:
   include:
-    - python: 3.6
-      env: TOXENV=py36-django110
     - python: 3.6
       env: TOXENV=py36-django111
+    - python: 3.6
+      env: TOXENV=py36-django20
     - python: 3.4  # i.e. skip installing 3.5
       env: TOXENV=lint
     - python: 3.4

Makefile

@@ -4,10 +4,18 @@
 help:
 	@echo "\nAvailable commands:\n\n $(shell sed -n 's/^.PHONY:\(.*\)/ *\1\\n/p' Makefile)"
 
-.PHONY: test  # runs tests using detox, combines coverage and reports it
+.PHONY: test  # runs tests
 test:
+	coverage run setup.py test
+
+.PHONY: test_all  # runs tests using detox, combines coverage and reports it
+test_all:
 	detox
-	coverage combine
+	make coverage
+
+.PHONY: coverage  # combines coverage and reports it
+coverage:
+	coverage combine || true
 	coverage report
 
 .PHONY: lint  # runs flake8
@@ -34,5 +42,5 @@ example:
 clean:
 	rm -rf dist/ *.egg *.egg-info .coverage .coverage.* example/db.sqlite3
 
-.PHONY: all  # runs clean, test, lint
-all: clean test lint
+.PHONY: all  # runs clean, test_all, lint
+all: clean test_all lint

tox.ini

@@ -4,20 +4,22 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py{34,35}-django{18,19,110,111}
-          py36-django{110,111}
+envlist = py34-django{ 18, 19, 110, 111, 20 },
+          py35-django{ 18, 19, 110, 111, 20 },
+          py36-django{              111, 20 }
 
 
 [testenv]
 passenv = COVERAGE_FILE
 commands =
-    coverage run setup.py test
+    make test
 install_command =
     pip install --no-binary --pre {opts} {packages}
 deps = django18: Django>=1.8,<1.9
        django19: Django>=1.9,<1.10
        django110: Django>=1.10,<1.11
        django111: Django>=1.11b1,<1.12
+       django20: Django>=2.0b1,<2.1
        coverage
 
 
@@ -28,15 +30,15 @@ skip_install = true
 passenv = COVERAGE_FILE
 basepython = python3.4
 commands =
-    coverage combine
-    coverage report
+    make coverage
 deps =
     coverage
 
 
 [testenv:lint]
+basepython = python3.4
 skip_install = true
 commands =
-    flake8
+    make lint
 deps =
     flake8