diff --git a/requirements/optionals.txt b/requirements/optionals.txt index 169af96f..cc65f342 100644 --- a/requirements/optionals.txt +++ b/requirements/optionals.txt @@ -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 diff --git a/requirements/testing.txt b/requirements/testing.txt index 22e38c79..ca067a02 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -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 \ No newline at end of file diff --git a/tests/conftest.py b/tests/conftest.py index fe079bc7..74298ba6 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -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 diff --git a/tests/test_serializers.py b/tests/test_serializers.py index 2e6c7e53..23165443 100644 --- a/tests/test_serializers.py +++ b/tests/test_serializers.py @@ -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