From 9a84b1af86cc16e108093405fb9861964bad7c79 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Wed, 22 Nov 2017 15:43:19 +0100
Subject: [PATCH] Fix test matrix.

---
 .travis.yml                  | 33 +++++++++------------------------
 dbtemplates/test_settings.py |  3 +++
 tox.ini                      | 13 +++++++++----
 3 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a771ead..83cb858 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,32 +1,17 @@
 language: python
-python: 3.5
+python:
+- '2.7'
+- '3.4'
+- '3.5'
+- '3.6'
+- pypy
 sudo: false
 cache: pip
-env:
-  - TOXENV=flake8-py27
-  - TOXENV=flake8-py35
-  - TOXENV=readme-py27
-  - TOXENV=py27-dj18
-  - TOXENV=py27-dj19
-  - TOXENV=py27-dj110
-  - TOXENV=py27-djmaster
-  - TOXENV=py34-dj18
-  - TOXENV=py34-dj19
-  - TOXENV=py34-dj110
-  - TOXENV=py34-djmaster
-  - TOXENV=py35-dj18
-  - TOXENV=py35-dj19
-  - TOXENV=py35-dj110
-  - TOXENV=py35-djmaster
-  - TOXENV=pypy-dj18
-  - TOXENV=pypy-dj19
-  - TOXENV=pypy-dj110
-  - TOXENV=pypy-djmaster
 install:
-  - pip install tox codecov
+  - pip install tox-travis
 script: tox -v
 after_success:
-  - codecov
+  - bash <(curl -s https://codecov.io/bash)
 deploy:
   provider: pypi
   user: jazzband
@@ -36,4 +21,4 @@ deploy:
   on:
     tags: true
     repo: jazzband/django-dbtemplates
-    condition: "$TOXENV = py27-dj110"
+    python: 3.6
diff --git a/dbtemplates/test_settings.py b/dbtemplates/test_settings.py
index 31a1946..1281399 100644
--- a/dbtemplates/test_settings.py
+++ b/dbtemplates/test_settings.py
@@ -39,6 +39,9 @@ TEMPLATES = [
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'OPTIONS': {
             'loaders': TEMPLATE_LOADERS,
+            'context_processors': [
+                'django.contrib.auth.context_processors.auth',
+            ]
         }
     },
 ]
diff --git a/tox.ini b/tox.ini
index 61f1bb6..032828e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,22 +6,27 @@ envlist =
     flake8-py27,
     flake8-py35,
     readme-py27,
-    py{27,34,35,py}-dj{18,19,110,master}
+    py{27,34,35}-dj{18,19,110}
+    py{27,34,35,36}-dj111
+    py{34,35,36}-dj20
 
 [testenv]
 basepython =
     py27: python2.7
     py34: python3.4
     py35: python3.5
+    py36: python3.6
     pypy: pypy
 usedevelop = true
 setenv =
     DJANGO_SETTINGS_MODULE = dbtemplates.test_settings
 deps =
     -rrequirements/tests.txt
-    dj18: https://github.com/django/django/archive/stable/1.8.x.tar.gz#egg=django
-    dj19: https://github.com/django/django/archive/stable/1.9.x.tar.gz#egg=django
-    dj110: https://github.com/django/django/archive/stable/1.10.x.tar.gz#egg=django
+    dj18: Django<1.9
+    dj19: Django<1.10
+    dj110: Django<1.11
+    dj111: Django<2.0
+    dj20: Django<2.1
     djmaster: https://github.com/django/django/archive/master.tar.gz#egg=django
 
 commands =