summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--online_test/settings.py12
-rw-r--r--online_test/urls.py2
-rw-r--r--requirements/requirements-common.txt2
3 files changed, 8 insertions, 8 deletions
diff --git a/online_test/settings.py b/online_test/settings.py
index b9a7a2c..3932cf3 100644
--- a/online_test/settings.py
+++ b/online_test/settings.py
@@ -43,7 +43,7 @@ INSTALLED_APPS = (
'django.contrib.staticfiles',
'yaksh',
'taggit',
- 'social.apps.django_app.default',
+ 'social_django',
'grades',
)
@@ -56,7 +56,7 @@ MIDDLEWARE_CLASSES = (
'yaksh.middleware.user_time_zone.TimezoneMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
- 'social.apps.django_app.middleware.SocialAuthExceptionMiddleware',
+ 'social_django.middleware.SocialAuthExceptionMiddleware',
)
ROOT_URLCONF = 'online_test.urls'
@@ -161,8 +161,8 @@ TEMPLATES = [
'OPTIONS': {
'context_processors': [
'django.contrib.auth.context_processors.auth',
- 'social.apps.django_app.context_processors.backends',
- 'social.apps.django_app.context_processors.login_redirect',
+ 'social_django.context_processors.backends',
+ 'social_django.context_processors.login_redirect',
],
'debug': False,
}
@@ -176,8 +176,8 @@ SOCIAL_AUTH_FACEBOOK_KEY = 'FACEBOOK_KEY_PROVIDED'
SOCIAL_AUTH_FACEBOOK_SECRET = 'FACEBOOK_SECRET_PROVIDED'
AUTHENTICATION_BACKENDS = (
- 'social.backends.google.GoogleOAuth2',
- 'social.backends.facebook.FacebookOAuth2',
+ 'social_core.backends.google.GoogleOAuth2',
+ 'social_core.backends.facebook.FacebookOAuth2',
'django.contrib.auth.backends.ModelBackend',
)
diff --git a/online_test/urls.py b/online_test/urls.py
index a09e961..18ebc54 100644
--- a/online_test/urls.py
+++ b/online_test/urls.py
@@ -14,7 +14,7 @@ urlpatterns = [
url(r'^$', views.index, name='index'),
url(r'^exam/', include('yaksh.urls', namespace='yaksh', app_name='yaksh')),
url(r'^exam/reset/', include('yaksh.urls_password_reset')),
- url(r'^', include('social.apps.django_app.urls', namespace='social')),
+ url(r'^', include('social_django.urls', namespace='social')),
url(r'^grades/', include('grades.urls', namespace='grades',
app_name='grades')),
]
diff --git a/requirements/requirements-common.txt b/requirements/requirements-common.txt
index 74bca38..319d5f6 100644
--- a/requirements/requirements-common.txt
+++ b/requirements/requirements-common.txt
@@ -4,7 +4,7 @@ django==1.11.18
django-taggit==0.18.1
pytz==2016.4
requests-oauthlib>=0.6.1
-python-social-auth==0.2.19
+social-auth-app-django==3.1.0
selenium==2.53.6
coverage
ruamel.yaml==0.15.23