Merge pull request #256 from mblayman/django-1.10

Add support for Django 1.10 and Django REST Framework 3.4

Author: jpadilla

.travis.yml

@@ -10,24 +10,33 @@ env:
     - TOX_ENV=py27-django1.8-drf3.1
     - TOX_ENV=py27-django1.8-drf3.2
     - TOX_ENV=py27-django1.8-drf3.3
+    - TOX_ENV=py27-django1.8-drf3.4
 
     - TOX_ENV=py27-django1.9-drf3.1
     - TOX_ENV=py27-django1.9-drf3.2
     - TOX_ENV=py27-django1.9-drf3.3
+    - TOX_ENV=py27-django1.9-drf3.4
+
+    - TOX_ENV=py27-django1.10-drf3.4
 
     - TOX_ENV=py33-django1.8-drf3.0
     - TOX_ENV=py33-django1.8-drf3.1
     - TOX_ENV=py33-django1.8-drf3.2
     - TOX_ENV=py33-django1.8-drf3.3
+    - TOX_ENV=py33-django1.8-drf3.4
 
     - TOX_ENV=py34-django1.8-drf3.0
     - TOX_ENV=py34-django1.8-drf3.1
     - TOX_ENV=py34-django1.8-drf3.2
     - TOX_ENV=py34-django1.8-drf3.3
+    - TOX_ENV=py34-django1.8-drf3.4
 
     - TOX_ENV=py34-django1.9-drf3.1
     - TOX_ENV=py34-django1.9-drf3.2
     - TOX_ENV=py34-django1.9-drf3.3
+    - TOX_ENV=py34-django1.9-drf3.4
+
+    - TOX_ENV=py34-django1.10-drf3.4
 
 matrix:
   fast_finish: true

README.rst

@@ -23,8 +23,8 @@ Requirements
 ------------
 
 -  Python (2.7, 3.3, 3.4)
--  Django (1.8, 1.9)
--  Django REST Framework (3.0, 3.1, 3.2, 3.3)
+-  Django (1.8, 1.9, 1.10)
+-  Django REST Framework (3.0, 3.1, 3.2, 3.3, 3.4)
 
 Installation
 ------------

docs/index.md

@@ -28,8 +28,8 @@ If you want to know more about JWT, check out the following resources:
 ## Requirements
 
 - Python (2.7, 3.3, 3.4)
-- Django (1.8, 1.9)
-- Django REST Framework (3.0, 3.1, 3.2, 3.3)
+- Django (1.8, 1.9, 1.10)
+- Django REST Framework (3.0, 3.1, 3.2, 3.3, 3.4)
 
 ## Security
 

tests/test_authentication.py

@@ -1,17 +1,7 @@
 import unittest
 
-from django.http import HttpResponse
 from django.test import TestCase
-from django.conf.urls import patterns
-
-from rest_framework import permissions, status
-try:
-    from rest_framework_oauth.authentication import OAuth2Authentication
-except ImportError:
-    try:
-        from rest_framework.authentication import OAuth2Authentication
-    except ImportError:
-        OAuth2Authentication = None
+from rest_framework import status
 try:
     try:
         from rest_framework_oauth.compat import oauth2_provider
@@ -30,12 +20,10 @@
         oauth2_provider = None
 
 from rest_framework.test import APIRequestFactory, APIClient
-from rest_framework.views import APIView
 
 from rest_framework_jwt import utils
 from rest_framework_jwt.compat import get_user_model
 from rest_framework_jwt.settings import api_settings, DEFAULTS
-from rest_framework_jwt.authentication import JSONWebTokenAuthentication
 
 User = get_user_model()
 
@@ -44,34 +32,8 @@
 factory = APIRequestFactory()
 
 
-class MockView(APIView):
-    permission_classes = (permissions.IsAuthenticated,)
-
-    def get(self, request):
-        return HttpResponse({'a': 1, 'b': 2, 'c': 3})
-
-    def post(self, request):
-        return HttpResponse({'a': 1, 'b': 2, 'c': 3})
-
-
-urlpatterns = patterns(
-    '',
-    (r'^jwt/$', MockView.as_view(
-     authentication_classes=[JSONWebTokenAuthentication])),
-
-    (r'^jwt-oauth2/$', MockView.as_view(
-        authentication_classes=[
-            JSONWebTokenAuthentication, OAuth2Authentication])),
-
-    (r'^oauth2-jwt/$', MockView.as_view(
-        authentication_classes=[
-            OAuth2Authentication, JSONWebTokenAuthentication])),
-)
-
-
 class JSONWebTokenAuthenticationTests(TestCase):
     """JSON Web Token Authentication"""
-    urls = 'tests.test_authentication'
 
     def setUp(self):
         self.csrf_client = APIClient(enforce_csrf_checks=True)

tests/test_serializers.py

@@ -1,8 +1,10 @@
 import unittest
 from distutils.version import StrictVersion
 
-import rest_framework
+import django
 from django.test import TestCase
+from django.test.utils import override_settings
+import rest_framework
 
 from rest_framework_jwt.compat import get_user_model
 from rest_framework_jwt.serializers import JSONWebTokenSerializer
@@ -68,6 +70,9 @@ def test_invalid_credentials(self):
         self.assertFalse(is_valid)
         self.assertEqual(serializer.errors, expected_error)
 
+    @unittest.skipIf(
+        django.VERSION[1] >= 10,
+        reason='The ModelBackend does not permit login when is_active is False.')
     def test_disabled_user(self):
         self.user.is_active = False
         self.user.save()
@@ -82,6 +87,25 @@ def test_disabled_user(self):
         self.assertFalse(is_valid)
         self.assertEqual(serializer.errors, expected_error)
 
+    @unittest.skipUnless(
+        django.VERSION[1] >= 10,
+        reason='The AllowAllUsersModelBackend permits login when is_active is False.')
+    @override_settings(AUTHENTICATION_BACKENDS=[
+        'django.contrib.auth.backends.AllowAllUsersModelBackend'])
+    def test_disabled_user_all_users_backend(self):
+        self.user.is_active = False
+        self.user.save()
+
+        serializer = JSONWebTokenSerializer(data=self.data)
+        is_valid = serializer.is_valid()
+
+        expected_error = {
+            'non_field_errors': ['User account is disabled.']
+        }
+
+        self.assertFalse(is_valid)
+        self.assertEqual(serializer.errors, expected_error)
+
     def test_required_fields(self):
         serializer = JSONWebTokenSerializer(data={})
         is_valid = serializer.is_valid()

tests/test_views.py

@@ -3,39 +3,28 @@
 from datetime import datetime, timedelta
 import time
 
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives.asymmetric import rsa
 from django import get_version
 from django.test import TestCase
 from django.test.utils import override_settings
-from django.conf.urls import patterns
 from rest_framework import status
 from rest_framework.test import APIClient
 
-from rest_framework_jwt import utils
+from rest_framework_jwt import utils, views
 from rest_framework_jwt.compat import get_user_model
 from rest_framework_jwt.settings import api_settings, DEFAULTS
 
-from cryptography.hazmat.backends import default_backend
-from cryptography.hazmat.primitives.asymmetric import rsa
-
 from . import utils as test_utils
 
 User = get_user_model()
 
 NO_CUSTOM_USER_MODEL = 'Custom User Model only supported after Django 1.5'
 
-urlpatterns = patterns(
-    '',
-    (r'^auth-token/$', 'rest_framework_jwt.views.obtain_jwt_token'),
-    (r'^auth-token-refresh/$', 'rest_framework_jwt.views.refresh_jwt_token'),
-    (r'^auth-token-verify/$', 'rest_framework_jwt.views.verify_jwt_token'),
-
-)
-
 orig_datetime = datetime
 
 
 class BaseTestCase(TestCase):
-    urls = 'tests.test_views'
 
     def setUp(self):
         self.email = 'jpueblo@example.com'
@@ -53,7 +42,8 @@ def setUp(self):
 class TestCustomResponsePayload(BaseTestCase):
 
     def setUp(self):
-        api_settings.JWT_RESPONSE_PAYLOAD_HANDLER = test_utils\
+        self.original_handler = views.jwt_response_payload_handler
+        views.jwt_response_payload_handler = test_utils\
             .jwt_response_payload_handler
         return super(TestCustomResponsePayload, self).setUp()
 
@@ -72,8 +62,7 @@ def test_jwt_login_custom_response_json(self):
         self.assertEqual(response.data['user'], self.username)
 
     def tearDown(self):
-        api_settings.JWT_RESPONSE_PAYLOAD_HANDLER =\
-            DEFAULTS['JWT_RESPONSE_PAYLOAD_HANDLER']
+        views.jwt_response_payload_handler = self.original_handler
 
 
 class ObtainJSONWebTokenTests(BaseTestCase):
@@ -166,7 +155,6 @@ def test_jwt_login_using_zero(self):
 @override_settings(AUTH_USER_MODEL='tests.CustomUser')
 class CustomUserObtainJSONWebTokenTests(TestCase):
     """JSON Web Token Authentication"""
-    urls = 'tests.test_views'
 
     def setUp(self):
         from .models import CustomUser
@@ -211,7 +199,6 @@ def test_jwt_login_json_bad_creds(self):
 @override_settings(AUTH_USER_MODEL='tests.CustomUserUUID')
 class CustomUserUUIDObtainJSONWebTokenTests(TestCase):
     """JSON Web Token Authentication"""
-    urls = 'tests.test_views'
 
     def setUp(self):
         from .models import CustomUserUUID

tests/urls.py

@@ -1,6 +1,40 @@
-"""
-Blank URLConf just to keep the test suite happy
-"""
-from django.conf.urls import patterns
+from django.conf.urls import url
+from django.http import HttpResponse
+from rest_framework import permissions
+from rest_framework.views import APIView
+try:
+    from rest_framework_oauth.authentication import OAuth2Authentication
+except ImportError:
+    try:
+        from rest_framework.authentication import OAuth2Authentication
+    except ImportError:
+        OAuth2Authentication = None
 
-urlpatterns = patterns('')
+from rest_framework_jwt import views
+from rest_framework_jwt.authentication import JSONWebTokenAuthentication
+
+
+class MockView(APIView):
+    permission_classes = (permissions.IsAuthenticated,)
+
+    def get(self, request):
+        return HttpResponse({'a': 1, 'b': 2, 'c': 3})
+
+    def post(self, request):
+        return HttpResponse({'a': 1, 'b': 2, 'c': 3})
+
+
+urlpatterns = [
+    url(r'^auth-token/$', views.obtain_jwt_token),
+    url(r'^auth-token-refresh/$', views.refresh_jwt_token),
+    url(r'^auth-token-verify/$', views.verify_jwt_token),
+
+    url(r'^jwt/$', MockView.as_view(
+        authentication_classes=[JSONWebTokenAuthentication])),
+    url(r'^jwt-oauth2/$', MockView.as_view(
+        authentication_classes=[
+            JSONWebTokenAuthentication, OAuth2Authentication])),
+    url(r'^oauth2-jwt/$', MockView.as_view(
+        authentication_classes=[
+            OAuth2Authentication, JSONWebTokenAuthentication])),
+]

tox.ini

@@ -1,20 +1,22 @@
 [tox]
 envlist =
        py27-{flake8,docs},
-       {py27,py33,py34}-django{1.8,1.9}-drf{3.0,3.1,3.2,3.3}
+       {py27,py33,py34}-django{1.8,1.9,1.10}-drf{3.0,3.1,3.2,3.3,3.4}
 
 [testenv]
-commands = ./runtests.py --fast {posargs}
+commands = ./runtests.py --fast {posargs} --verbose
 setenv =
        PYTHONDONTWRITEBYTECODE=1
 deps =
        django1.8: Django==1.8.7
        django1.9: Django==1.9.0
+       django1.10: Django==1.10
        drf2.4: djangorestframework==2.4.5
        drf3.0: djangorestframework==3.0.5
        drf3.1: djangorestframework==3.1.3
        drf3.2: djangorestframework==3.2.2
        drf3.3: djangorestframework==3.3.2
+       drf3.4: djangorestframework==3.4.6
        py27-django{1.8,1.9}-drf{3.1,3.2,3.3}: djangorestframework-oauth==1.0.1
        -rrequirements/testing.txt