From fa2eb8a7e0e462d588bfe58b64345edcef6fb75e Mon Sep 17 00:00:00 2001
From: RedBeardCode <s.farmbauer@red-beard-code.de>
Date: Mon, 4 Dec 2017 19:51:44 +0100
Subject: [PATCH 1/2] Add support for django 2.0

---
 invitations/models.py         | 5 ++++-
 tests/allauth/test_allauth.py | 5 ++++-
 tests/basic/tests.py          | 5 ++++-
 tox.ini                       | 3 ++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/invitations/models.py b/invitations/models.py
index 2d82ebf..e371ac2 100644
--- a/invitations/models.py
+++ b/invitations/models.py
@@ -2,7 +2,10 @@
 
 from django.conf import settings
 from django.contrib.sites.models import Site
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 from django.db import models
 from django.utils import timezone
 from django.utils.crypto import get_random_string
diff --git a/tests/allauth/test_allauth.py b/tests/allauth/test_allauth.py
index 11a630b..74a272e 100644
--- a/tests/allauth/test_allauth.py
+++ b/tests/allauth/test_allauth.py
@@ -1,4 +1,7 @@
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 from django.test.client import RequestFactory
 from django.test import Client
 
diff --git a/tests/basic/tests.py b/tests/basic/tests.py
index a1c43c9..252ceb4 100644
--- a/tests/basic/tests.py
+++ b/tests/basic/tests.py
@@ -7,7 +7,10 @@
 from django.test.client import RequestFactory
 from django.test.utils import override_settings
 from django.utils import timezone
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 from django.core import mail
 from django.contrib.auth.models import AnonymousUser
 
diff --git a/tox.ini b/tox.ini
index a51b9c9..88886fb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,33,34,35}-django{18,19,1.10,1.11}-backend{Basic,Allauth}
+envlist = py{27,33,34,35,36}-django{18,19,1.10,1.11}-backend{Basic,Allauth}
 
 [pytest]
 python_files = tests.py test_*.py
@@ -11,6 +11,7 @@ deps =
   django19: Django<1.10
   django110: Django<1.11
   django111: Django<2
+  django20: Django<2.1
   backendAllauth: django-allauth
 commands =
   python -V

From 367c229190a26e9335c3fb08c210f21cc10eb38e Mon Sep 17 00:00:00 2001
From: bee-keeper <ricbottomley@gmail.com>
Date: Sat, 9 Dec 2017 14:13:32 +0000
Subject: [PATCH 2/2] Update tox.ini

---
 tox.ini | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 88886fb..855f8f4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,33,34,35,36}-django{18,19,1.10,1.11}-backend{Basic,Allauth}
+envlist = py{27,33,34,35,36}-django{19,1.10,1.11}-backend{Basic,Allauth}
 
 [pytest]
 python_files = tests.py test_*.py
@@ -7,7 +7,6 @@ python_files = tests.py test_*.py
 [testenv]
 deps =
   -rrequirements.txt
-  django18: Django<1.9
   django19: Django<1.10
   django110: Django<1.11
   django111: Django<2