Merge pull request #32 from caravancoop/feature/fix-deps

Ensure Django 2 compatibility.

Author: merwok

.circleci/config.yml

@@ -4,12 +4,35 @@ workflows:
   version: 2
   rest-auth-toolkit:
     jobs:
+      - test-py37
       - test-py36
       - test-py27
       - check
 
 jobs:
 
+  test-py37:
+    docker:
+      - image: circleci/python:3.7
+    working_directory: ~/rest-auth-toolkit
+    steps:
+      - checkout
+      - restore_cache:
+          key: rest-auth-toolkit-py37-v1
+      - run:
+          name: Install CI tools
+          command: |
+            python3.7 -m venv venv
+            venv/bin/pip install tox
+      - run:
+          name: Test with Python 3.7
+          command: venv/bin/tox -e py37
+      - save_cache:
+          key: rest-auth-toolkit-py37-v1
+          paths:
+            - venv
+            - .tox
+
   test-py36:
     docker:
       - image: circleci/python:3.6

demo/demo/accounts/migrations/0003_auto_20180921_2351.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.0.8 on 2018-09-21 23:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0002_auto_20180222_0012'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='last_name',
+            field=models.CharField(blank=True, max_length=150, verbose_name='last name'),
+        ),
+    ]

demo/demo/urls.py

@@ -1,26 +1,26 @@
 """demo URL Configuration."""
 
-from django.conf.urls import url, include
+from django.urls import include, path
 from django.contrib import admin
 
 from rest_auth_toolkit.views import FacebookLoginView, LoginView, LogoutView, SignupView
 
 
 auth_urlpatterns = [
-    url(r'^signup/', SignupView.as_view(), name='signup'),
-    url(r'^login/', LoginView.as_view(), name='login'),
-    url(r'^logout/', LogoutView.as_view(), name='logout'),
-    url(r'^fb-login/', FacebookLoginView.as_view(), name='fb-login'),
+    path('signup/', SignupView.as_view(), name='signup'),
+    path('login/', LoginView.as_view(), name='login'),
+    path('logout/', LogoutView.as_view(), name='logout'),
+    path('fb-login/', FacebookLoginView.as_view(), name='fb-login'),
 ]
 
 api_urlpatterns = [
-    url(r'^account/', include('demo.accounts.urls')),
-    url(r'', include((auth_urlpatterns, 'auth'))),
+    path('account/', include('demo.accounts.urls')),
+    path('', include((auth_urlpatterns, 'auth'))),
 ]
 
 urlpatterns = [
-    url(r'^admin/', admin.site.urls),
-    url(r'^api/', include(api_urlpatterns)),
-    url(r'', include('demo.pages.urls')),
-    url(r'', include('demo.pages.auth_urls')),
+    path('admin/', admin.site.urls),
+    path('api/', include(api_urlpatterns)),
+    path('', include('demo.pages.urls')),
+    path('', include('demo.pages.auth_urls')),
 ]

demo/requirements.in

@@ -1,15 +1,18 @@
 pip-tools
 
-django ~= 1.11
+django == 2.0.*
 djangorestframework
 django-debug-toolbar
 
-# Note: rest-framework-auth-toolkit is not here, it should already
-# be importable if you do pip install -e from your dev virtualenv.
-
 django-model-utils
 django-shortuuidfield
 
+# Note: rest-framework-auth-toolkit is not here, it should already
+# be importable if you do "pip install -e ." from your dev virtualenv.
+# We do include facepy here to make sure requirements.txt
+# contains all transitive dependencies.
+facepy
+
 # for the browsable API
 markdown
 pygments

demo/requirements.txt

@@ -4,17 +4,23 @@
 #
 #    pip-compile --output-file requirements.txt requirements.in
 #
+certifi==2018.8.24        # via requests
+chardet==3.0.4            # via requests
 click==6.7                # via pip-tools
-django-debug-toolbar==1.9.1
-django-model-utils==3.1.1
+django-debug-toolbar==1.10.1
+django-model-utils==3.1.2
 django-shortuuidfield==0.1.3
-django==1.11.10
-djangorestframework==3.7.7
+django==2.0.8
+djangorestframework==3.8.2
+facepy==1.0.9
 first==2.0.1              # via pip-tools
+idna==2.7                 # via requests
 markdown==2.6.11
-pip-tools==1.11.0
+pip-tools==2.0.2
 pygments==2.2.0
-pytz==2018.3              # via django
+pytz==2018.5              # via django
+requests==2.19.1          # via facepy
 shortuuid==0.5.0          # via django-shortuuidfield
-six==1.11.0               # via django-shortuuidfield, pip-tools
+six==1.11.0               # via django-shortuuidfield, facepy, pip-tools
 sqlparse==0.2.4           # via django-debug-toolbar
+urllib3==1.23             # via requests

rest_auth_toolkit/serializers.py

@@ -5,7 +5,10 @@
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
-import facepy
+try:
+    import facepy
+except ImportError:
+    facepy = None
 
 
 User = get_user_model()

rest_auth_toolkit/views.py

@@ -11,6 +11,11 @@
 from .serializers import FacebookLoginDeserializer, LoginDeserializer, SignupDeserializer
 from .utils import get_object_from_setting, get_setting, MissingSetting
 
+try:
+    import facepy
+except ImportError:
+    facepy = None
+
 
 User = get_user_model()
 Token = get_object_from_setting('api_token_class')
@@ -93,6 +98,16 @@ class FacebookLoginView(generics.GenericAPIView):
     serializer_class = get_object_from_setting('facebook_login_serializer_class',
                                                FacebookLoginDeserializer)
 
+    @classmethod
+    def as_view(cls, *args, **kwargs):
+        if facepy is None:
+            raise TypeError('install rest-framework-auth-toolkit[facebook] '
+                            'to enable Facebook logins')
+
+        # TODO error if settings are missing
+
+        return super(FacebookLoginView, cls).as_view(*args, **kwargs)
+
     def post(self, request):
         deserializer = self.get_serializer(data=request.data)
         deserializer.is_valid(raise_exception=True)

setup.py

@@ -1,16 +1,23 @@
+# encoding: utf-8
 from setuptools import setup
 
 long_description = '''
 This libary provides mixins and views to handle signup, login and logout
 in an API built with django-rest-framework.  After login, client
 applications get a token for the API requests.
 
-Email-based signups and Facebook login are supported.
+Email-based signups are supported out of the box.
+Other methods require you to specify an extra in your requirements;
+for example, to use Facebook login you need to depend on
+`rest-framework-auth-toolkit[facebook]`.
 
 Contrary to other similar modules, rest-auth-toolkit doess not provide
 a set of Django apps to include and configure in your settings, but a
 collection of mixins, base classes, base views and simple templates
 that you can integrate and customize in your own apps.
+
+⚠️ This library is not stable yet, make sure to pin your dependencies.
+Recommended form: rest-framework-auth-toolkit == 0.9.*
 '''
 
 setup(
@@ -28,14 +35,19 @@
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
+        'Framework :: Django :: 2.1',
     ],
     packages=[
         'rest_auth_toolkit',
     ],
     include_package_data=True,
     install_requires=[
-        'django ~= 1.11',
-        'djangorestframework',
-        'facepy',
+        'django >= 1.11',
     ],
+    extras_require={
+        'facebook': ['facepy'],
+    },
 )

tox.ini

@@ -22,7 +22,7 @@ deps =
     check-manifest
     docutils
     readme_renderer
-    safety
+    safety >= 1.8.4
 commands =
     python setup.py check -r -s -m
     check-manifest -v --ignore .circleci,.circleci/* --ignore-bad-ideas '*.mo'