Skip to content

Commit bbc3f75

Browse files
committed
Add support for Django 2.0
1 parent 1442d98 commit bbc3f75

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ matrix:
1111
- python: "3.4"
1212
env: TOX_ENVS=py34-django111
1313
- python: "3.5"
14-
env: TOX_ENVS=py35-django111
14+
env: TOX_ENVS=py35-django111,py35-django20
1515
- python: "3.6"
16-
env: TOX_ENVS=py36-django111
16+
env: TOX_ENVS=py36-django111,py36-django20
1717
script:
1818
- tox -e $TOX_ENVS

djactasauth/util.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from django.core.urlresolvers import reverse
1+
from django.urls import reverse
22
from django.utils.six.moves.urllib import parse
33
from djactasauth.backends import ActAsBackend
44

settings.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
'testapp',
2323
)
2424

25-
MIDDLEWARE_CLASSES = [
25+
MIDDLEWARE = [
2626
'django.contrib.sessions.middleware.SessionMiddleware',
2727
'django.contrib.auth.middleware.AuthenticationMiddleware',
2828
]

setup.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
],
3232
include_package_data=True,
3333
install_requires=[
34-
'Django==1.11',
34+
'Django==1.11;python_version<"3.5"',
35+
'Django>=1.11,<2.1;python_version>"3.4"',
3536
],
3637
license="BSD",
3738
zip_safe=False,
@@ -50,5 +51,6 @@
5051
'Programming Language :: Python :: 3.6',
5152
'Framework :: Django',
5253
'Framework :: Django :: 1.11',
54+
'Framework :: Django :: 2.0',
5355
],
5456
)

tox.ini

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
[tox]
33
envlist =
44
py{27,34,35,36}-django111,
5+
py{35,36}-django20,
56

67
[testenv]
78
commands =

0 commit comments

Comments
 (0)