Skip to content
This repository has been archived by the owner on May 26, 2020. It is now read-only.

Django 2.0 supprt #479

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements/optionals.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
oauth2==1.5.211
oauth2==1.9.0.post1
django-oauth-plus==2.2.6
django-oauth2-provider==0.2.6.1
8 changes: 4 additions & 4 deletions requirements/testing.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pytest==2.6.4
pytest-django==2.8.0
pytest-cov==1.6
cryptography==2.0.3
pytest==4.4.1
pytest-django==3.4.8
pytest-cov==2.6.1
cryptography==2.6.1
12 changes: 8 additions & 4 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,14 @@ def pytest_configure():
except ImportError:
pass
else:
settings.INSTALLED_APPS += (
'oauth_provider',
)

if django.VERSION[0] > 1:
settings.INSTALLED_APPS += (
'oauth2_provider',
)
else:
settings.INSTALLED_APPS += (
'oauth_provider',
)
try:
if django.VERSION >= (1, 8):
# django-oauth2-provider does not support Django1.8
Expand Down
2 changes: 1 addition & 1 deletion tests/test_serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def test_invalid_credentials(self):
self.assertEqual(serializer.errors, expected_error)

@unittest.skipIf(
django.VERSION[1] >= 10,
django.VERSION[1] >= 1,
reason='The ModelBackend does not permit login when is_active is False.')
def test_disabled_user(self):
self.user.is_active = False
Expand Down