Skip to content

Commit 8ad4200

Browse files
authored
Test against django 2.1 (#338)
* Test against django 2.1 * Fix tests
1 parent 21a5e22 commit 8ad4200

File tree

7 files changed

+17
-8
lines changed

7 files changed

+17
-8
lines changed

Diff for: CHANGELOG

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ django-registration-redux changelog
44

55
Version 2.5, TBD
66
----------------
7-
7+
* Feature: Add support for Django 2.1. -
8+
`#337 <https://github.com/macropin/django-registration/pull/337>_`
89

910
Version 2.4, 11 April, 2018
1011
----------------

Diff for: docs/release-notes.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Release notes
44
=============
55

66
The |version| release of |project| supports Python 2.7, 3.4, 3.5, 3.6 and
7-
Django 1.11 and 2.0.
7+
Django 1.11, 2.0, and 2.1.

Diff for: setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ def run_tests(self):
4040
'Framework :: Django',
4141
'Framework :: Django :: 1.11',
4242
'Framework :: Django :: 2.0',
43+
'Framework :: Django :: 2.1',
4344
'Intended Audience :: Developers',
4445
'License :: OSI Approved :: BSD License',
4546
'Operating System :: OS Independent',

Diff for: test_app/urls_admin_approval.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
TemplateView.as_view(template_name='profile.html'),
1818
name='profile'),
1919

20-
url(r'^login/',
21-
auth_views.login,
20+
url(r'^login/$',
21+
auth_views.LoginView.as_view(
22+
template_name='registration/login.html'),
2223
name='login'),
2324

2425
url(r'^admin/',

Diff for: test_app/urls_default.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
TemplateView.as_view(template_name='profile.html'),
1818
name='profile'),
1919

20-
url(r'^login/',
21-
auth_views.login,
20+
url(r'^login/$',
21+
auth_views.LoginView.as_view(
22+
template_name='registration/login.html'),
2223
name='login'),
2324

2425
url(r'^admin/',

Diff for: test_app/urls_simple.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
TemplateView.as_view(template_name='profile.html'),
1818
name='profile'),
1919

20-
url(r'^login/',
21-
auth_views.login,
20+
url(r'^login/$',
21+
auth_views.LoginView.as_view(
22+
template_name='registration/login.html'),
2223
name='login'),
2324

2425
url(r'^admin/',

Diff for: tox.ini

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
envlist =
88
{py27,py34,py35,py36}-django111,
99
{py34,py35,py36}-django20,
10+
{py35,py36}-django21,
1011

1112
[testenv]
1213
commands =
@@ -15,10 +16,13 @@ deps =
1516
-rtest-requirements.txt
1617
django111: Django>=1.11,<2.0
1718
django20: Django>=2.0,<2.1
19+
django21: Django>=2.1,<2.2
1820

1921
[travis]
2022
python =
2123
2.7: py27
2224
3.4: py34
2325
3.5: py35
2426
3.6: py36
27+
# TODO add python 3.7 support when travis adds this.
28+
# https://github.com/travis-ci/travis-ci/issues/9815

0 commit comments

Comments
 (0)