Merge 367c229 into feb821b

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

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
 

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
 

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{19,1.10,1.11}-backend{Basic,Allauth}
 
 [pytest]
 python_files = tests.py test_*.py
@@ -10,6 +10,7 @@ deps =
   django19: Django<1.10
   django110: Django<1.11
   django111: Django<2
+  django20: Django<2.1
   backendAllauth: django-allauth
 commands =
   python -V