Test against django 2.1 (#338)

* Test against django 2.1 * Fix tests
macropin · Aug 2, 2018 · 8ad4200 · 8ad4200
1 parent 21a5e22
commit 8ad4200
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -4,7 +4,8 @@ django-registration-redux changelog
 
 Version 2.5, TBD
 ----------------
-
+* Feature: Add support for Django 2.1. -
+`#337 <https://github.com/macropin/django-registration/pull/337>_`
 
 Version 2.4, 11 April, 2018
 ----------------

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
@@ -4,4 +4,4 @@ Release notes
 =============
 
 The |version| release of |project| supports Python 2.7, 3.4, 3.5, 3.6 and
-Django 1.11 and 2.0.
+Django 1.11, 2.0, and 2.1.
diff --git a/setup.py b/setup.py
@@ -40,6 +40,7 @@ def run_tests(self):
         'Framework :: Django',
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
+        'Framework :: Django :: 2.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',

diff --git a/test_app/urls_admin_approval.py b/test_app/urls_admin_approval.py
@@ -17,8 +17,9 @@
         TemplateView.as_view(template_name='profile.html'),
         name='profile'),
 
-    url(r'^login/',
-        auth_views.login,
+    url(r'^login/$',
+        auth_views.LoginView.as_view(
+            template_name='registration/login.html'),
         name='login'),
 
     url(r'^admin/',

diff --git a/test_app/urls_default.py b/test_app/urls_default.py
@@ -17,8 +17,9 @@
         TemplateView.as_view(template_name='profile.html'),
         name='profile'),
 
-    url(r'^login/',
-        auth_views.login,
+    url(r'^login/$',
+        auth_views.LoginView.as_view(
+            template_name='registration/login.html'),
         name='login'),
 
     url(r'^admin/',

diff --git a/test_app/urls_simple.py b/test_app/urls_simple.py
@@ -17,8 +17,9 @@
         TemplateView.as_view(template_name='profile.html'),
         name='profile'),
 
-    url(r'^login/',
-        auth_views.login,
+    url(r'^login/$',
+        auth_views.LoginView.as_view(
+            template_name='registration/login.html'),
         name='login'),
 
     url(r'^admin/',

diff --git a/tox.ini b/tox.ini
@@ -7,6 +7,7 @@
 envlist =
     {py27,py34,py35,py36}-django111,
     {py34,py35,py36}-django20,
+    {py35,py36}-django21,
 
 [testenv]
 commands =
@@ -15,10 +16,13 @@ deps =
   -rtest-requirements.txt
   django111: Django>=1.11,<2.0
   django20: Django>=2.0,<2.1
+  django21: Django>=2.1,<2.2
 
 [travis]
 python =
   2.7: py27
   3.4: py34
   3.5: py35
   3.6: py36
+# TODO add python 3.7 support when travis adds this.
+# https://github.com/travis-ci/travis-ci/issues/9815