diff --git a/requirements/base.txt b/requirements/base.txt index 4cc305a..fbc2188 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -15,7 +15,8 @@ markdown pillow psycopg2 PyJWT -python-social-auth<0.3 +#python-social-auth ## deprecated +social-auth-app-django pytz==2013d requests requests-oauthlib diff --git a/src/kasu/settings.py b/src/kasu/settings.py index acdce80..490ebd9 100644 --- a/src/kasu/settings.py +++ b/src/kasu/settings.py @@ -43,7 +43,7 @@ PREREQ_APPS = [ 'ckeditor', 'ckeditor_uploader', 'easy_thumbnails', - 'social.apps.django_app.default', + 'social_django', ] PROJECT_APPS = [ 'kasu', @@ -135,9 +135,9 @@ DEFAULT_FROM_EMAIL = "" # Login Settings ACCOUNT_ACTIVATION_DAYS = 5 AUTH_USER_MODEL = 'membership.Membership' -AUTHENTICATION_BACKENDS = ('social.backends.facebook.FacebookOAuth2', - 'social.backends.google.GoogleOAuth2', - 'social.backends.twitter.TwitterOAuth', +AUTHENTICATION_BACKENDS = ('social_core.backends.facebook.FacebookOAuth2', + 'social_core.backends.google.GoogleOAuth2', + 'social_core.backends.twitter.TwitterOAuth', 'django.contrib.auth.backends.ModelBackend',) LOGIN_URL = '/membership/login/' LOGIN_ERROR_URL = '/membership/login/error/' diff --git a/src/membership/urls.py b/src/membership/urls.py index 060fbd4..cb4dcb9 100644 --- a/src/membership/urls.py +++ b/src/membership/urls.py @@ -10,7 +10,7 @@ from . import views urlpatterns = patterns( '', - url('', include('social.apps.django_app.urls', namespace='social')), + url('', include('social_django.urls', namespace='social')), url('', include('django.contrib.auth.urls')), url(r'^register/$', views.RegisterForm.as_view(),