From 8762ff5dc00c4c552655134970c8a261f9bd7366 Mon Sep 17 00:00:00 2001
From: Marc Tamlyn <marc.tamlyn@gmail.com>
Date: Wed, 13 Dec 2017 09:23:47 +0000
Subject: [PATCH] Update version support for django 2.0

---
 .travis.yml                   | 6 ++++--
 setup.py                      | 2 +-
 tests/testproject/settings.py | 3 ++-
 tox.ini                       | 5 +++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c61785d..a5beca3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,16 +8,16 @@ env:
   - TOX_ENV=py27-django19
   - TOX_ENV=py27-django110
   - TOX_ENV=py27-django111
-  - TOX_ENV=py33-django18
   - TOX_ENV=py34-django18
   - TOX_ENV=py34-django19
   - TOX_ENV=py34-django110
   - TOX_ENV=py34-django111
-  - TOX_ENV=py34-djangomaster
+  - TOX_ENV=py34-django20
   - TOX_ENV=py35-django18
   - TOX_ENV=py35-django19
   - TOX_ENV=py35-django110
   - TOX_ENV=py35-django111
+  - TOX_ENV=py35-django20
   - TOX_ENV=py35-djangomaster
 matrix:
   include:
@@ -29,6 +29,8 @@ matrix:
       python: "3.6"
     - env: TOX_ENV=py36-django111
       python: "3.6"
+    - env: TOX_ENV=py36-django20
+      python: "3.6"
     - env: TOX_ENV=py36-djangomaster
       python: "3.6"
 install: pip install tox
diff --git a/setup.py b/setup.py
index 0e12055..d838f98 100755
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def read(*parts):
     url='https://github.com/python-babel/django-babel/',
     packages=find_packages(exclude=('tests',)),
     install_requires=[
-        'django>=1.4,<1.12',
+        'django>=1.8,<3.0',
         'babel>=1.3',
     ],
     classifiers=[
diff --git a/tests/testproject/settings.py b/tests/testproject/settings.py
index e3b46c8..50071ad 100644
--- a/tests/testproject/settings.py
+++ b/tests/testproject/settings.py
@@ -7,10 +7,11 @@
     'django_babel',
     'testproject',
 ]
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
     'django.middleware.locale.LocaleMiddleware',
     'django_babel.middleware.LocaleMiddleware',
 ]
+MIDDLEWARE_CLASSES = MIDDLEWARE  # backwards compat
 TEMPLATES = [
     {
         'NAME': 'default',
diff --git a/tox.ini b/tox.ini
index d45be3d..ec0fed4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{34,35,36}-djangomaster, py{27,34,35,36}-django{18,19,110,111}, py33-django18, lint, docs
+envlist = py{35,36}-djangomaster, py{27,34,35,36}-django{18,19,110,111,20}, lint, docs
 
 [testenv]
 deps =
@@ -11,7 +11,8 @@ deps =
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
-    django111: Django>=1.11,<1.12
+    django111: Django>=1.11,<2.0
+    django20: Django>=2.0,<2.1
     djangomaster: https://github.com/django/django/archive/master.tar.gz#egg=Django
 commands = py.test {posargs}