[TASK] Upgrade django to 1.11, upgrade social auth library, upgrade other libraries.

Author: tomvlk

requirements.txt

@@ -1,34 +1,36 @@
 # Django & Core
-Django==1.8.18
-pymysql==0.7.11
-django-material==0.13.1
-urllib3==1.20
-django-crispy-forms==1.6.1
-django-watson==1.3.1
-django_compressor==2.1.1
-django-cors-headers==2.0.2
-python-social-auth==0.2.21
-django-stronghold==0.2.8
+Django==1.11.9
+pymysql==0.8.0
+django-material==1.2.2
+urllib3==1.22
+django-crispy-forms==1.7.0
+django-watson==1.5.0
+django_compressor==2.2
+django-cors-headers==2.1.0
+django-stronghold==0.3.0
 
-jsonfield==2.0.1
+social-auth-app-django==2.1.0
+# OLD: python-social-auth==0.2.21
+
+jsonfield==2.0.2
 
 # Debuging & Logging
-colorlog==2.10.0
-django-debug-toolbar==1.7
-django-extensions==1.7.8
-Werkzeug==0.12.1
+colorlog==3.1.0
+django-debug-toolbar==1.9.1
+django-extensions==1.9.9
+Werkzeug==0.14.1
 
 # Documentation
 sphinx
 sphinx_rtd_theme
 django-docs==0.2.1
 
 # API
-djangorestframework==3.6.2
+djangorestframework==3.7.7
 pygments==2.2.0
 
 # Testing and tools
-fake-factory
+Faker
 
 # Server
 gunicorn

src/apps/accounts/middleware.py

@@ -1,9 +1,17 @@
 from django.contrib import messages
 from django.shortcuts import render
-from social.exceptions import AuthCanceled, AuthForbidden
+from social_core.exceptions import AuthCanceled, AuthForbidden
 
 
 class SocialAuthExceptionMiddleware:
+
+	def __init__(self, get_response):
+		self.get_response = get_response
+
+	def __call__(self, request):
+		response = self.get_response(request)
+		return response
+
 	def process_exception(self, request, exception):
 		if type(exception) == AuthCanceled:
 			messages.warning(request, 'Login session is canceled!')

src/apps/accounts/views.py

@@ -1,10 +1,9 @@
 from django.conf import settings
 from django.contrib.auth import authenticate, login as django_login, logout as django_logout
-from django.shortcuts import redirect, render_to_response
-from django.template import RequestContext
+from django.shortcuts import redirect, render
 from django.views.generic import TemplateView, View
 from rest_framework.authtoken.models import Token
-from social.apps.django_app.utils import get_backend, BACKENDS
+from social_django.utils import get_backend, BACKENDS
 from stronghold.views import StrongholdPublicMixin
 
 from apps.accounts.utils import get_social_button
@@ -38,11 +37,11 @@ def get(self, request, *args, **kwargs):
 
 		form = forms.LoginForm()
 
-		return render_to_response(self.template_name, {
+		return render(request, self.template_name, {
 			'form': form,
 			'next': redirect_url,
 			'social': self.social_config
-		}, context_instance=RequestContext(request))
+		})
 
 	def post(self, request, *args, **kwargs):
 		form = forms.LoginForm(data=request.POST)
@@ -59,11 +58,11 @@ def post(self, request, *args, **kwargs):
 					return redirect(redirect_url)
 			form.errors['__all__'] = form.error_class(["Email and password combination is wrong"])
 
-		return render_to_response(self.template_name, {
+		return render(request, self.template_name, {
 			'form': form,
 			'next': redirect_url,
 			'social': self.social_config
-		}, context_instance=RequestContext(request))
+		})
 
 
 class Logout(View):

src/apps/mails/apps.py

@@ -1,7 +1,6 @@
 from django.apps import AppConfig
 
 from apps.core.menu import Menu, Item
-from apps.mails import models
 
 
 class MailsConfig(AppConfig):

src/config/settings/__init__.py

@@ -15,4 +15,3 @@
 
 # Debug override
 DEBUG = bool(int(os.getenv('DJANGO_IS_DEBUG', True)))
-TEMPLATE_DEBUG = DEBUG

src/config/settings/base.py

@@ -90,10 +90,11 @@
 	'django.contrib.messages',
 	'django.contrib.staticfiles',
 	'django.contrib.humanize',
+	'django_extensions',
 	'stronghold',
 	'crispy_forms',
 	'material',
-	'material.admin',
+	'material.frontend',
 	'rest_framework',
 	'rest_framework.authtoken',
 	'compressor',
@@ -103,7 +104,7 @@
 
 # Add app for social login.
 if 'social' in local.AUTHENTICATION and type(local.AUTHENTICATION['social']) is dict:
-	INSTALLED_APPS.append('social.apps.django_app.default')
+	INSTALLED_APPS.append('social_django')
 
 # Add source apps
 INSTALLED_APPS += [
@@ -137,48 +138,30 @@
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 
 ####
-# Templates & Middleware
+# Middleware
 ####
-if 'TEMPLATE_CONTEXT_PROCESSORS' not in globals():
-	TEMPLATE_CONTEXT_PROCESSORS = []
-
-TEMPLATE_CONTEXT_PROCESSORS += (
-	'django.core.context_processors.request',
-	'django.contrib.messages.context_processors.messages',
-	'apps.core.context.add_global_context',
-	'apps.filters.context.add_global_context',
-	'apps.mails.context.add_global_context',
-)
-
 # Add social processors
 SOCIAL_ENABLED = False
 if 'social' in local.AUTHENTICATION and 'enabled' in local.AUTHENTICATION['social'] and local.AUTHENTICATION['social'][
 	'enabled']:
 	SOCIAL_ENABLED = True
 
-	TEMPLATE_CONTEXT_PROCESSORS += (
-		'social.apps.django_app.context_processors.login_redirect',
-		'social.apps.django_app.context_processors.backends',
-	)
-
 CRISPY_TEMPLATE_PACK = 'bootstrap3'
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = [
+	'django.middleware.security.SecurityMiddleware',
 	'django.contrib.sessions.middleware.SessionMiddleware',
-
-	'corsheaders.middleware.CorsMiddleware',
+	'django.middleware.locale.LocaleMiddleware',
 	'django.middleware.common.CommonMiddleware',
 	'django.middleware.csrf.CsrfViewMiddleware',
-
 	'django.contrib.auth.middleware.AuthenticationMiddleware',
-	'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
-
 	'django.contrib.messages.middleware.MessageMiddleware',
 	'django.middleware.clickjacking.XFrameOptionsMiddleware',
 
+	'corsheaders.middleware.CorsMiddleware',
 	'stronghold.middleware.LoginRequiredMiddleware',
 	'apps.accounts.middleware.SocialAuthExceptionMiddleware',
-)
+]
 
 ####
 # Authentication and security
@@ -216,26 +199,26 @@
 
 # Add default social options
 if SOCIAL_ENABLED:
-	SOCIAL_AUTH_STRATEGY = 'social.strategies.django_strategy.DjangoStrategy'
-	SOCIAL_AUTH_STORAGE = 'social.apps.django_app.default.models.DjangoStorage'
+	SOCIAL_AUTH_STRATEGY = 'social_django.strategy.DjangoStrategy'
+	SOCIAL_AUTH_STORAGE = 'social_django.models.DjangoStorage'
 
 	SOCIAL_AUTH_PIPELINE = (
-		'social.pipeline.social_auth.social_details',
-		'social.pipeline.social_auth.social_uid',
-		'social.pipeline.social_auth.auth_allowed',
-		'social.pipeline.social_auth.social_user',
-		'social.pipeline.social_auth.associate_by_email',
-		'social.pipeline.user.get_username',
-		'social.pipeline.user.create_user',
-		'social.pipeline.social_auth.associate_user',
-		'social.pipeline.social_auth.load_extra_data',
-		'social.pipeline.user.user_details',
+		'social_core.pipeline.social_auth.social_details',
+		'social_core.pipeline.social_auth.social_uid',
+		'social_core.pipeline.social_auth.auth_allowed',
+		'social_core.pipeline.social_auth.social_user',
+		'social_core.pipeline.social_auth.associate_by_email',
+		'social_core.pipeline.user.get_username',
+		'social_core.pipeline.user.create_user',
+		'social_core.pipeline.social_auth.associate_user',
+		'social_core.pipeline.social_auth.load_extra_data',
+		'social_core.pipeline.user.user_details',
 	)
 
 	SOCIAL_AUTH_DISCONNECT_PIPELINE = (
-		'social.pipeline.disconnect.get_entries',
-		'social.pipeline.disconnect.revoke_tokens',
-		'social.pipeline.disconnect.disconnect'
+		'social_core.pipeline.disconnect.get_entries',
+		'social_core.pipeline.disconnect.revoke_tokens',
+		'social_core.pipeline.disconnect.disconnect'
 	)
 
 # Add social pipelines
@@ -250,10 +233,27 @@
 ####
 # Template and cache
 ####
-TEMPLATE_LOADERS = (
-	'django.template.loaders.filesystem.Loader',
-	'django.template.loaders.app_directories.Loader',
-)
+TEMPLATES = [
+	{
+		'BACKEND': 'django.template.backends.django.DjangoTemplates',
+		'DIRS': [],
+		'APP_DIRS': True,
+		'OPTIONS': {
+			'context_processors': [
+				'django.template.context_processors.debug',
+				'django.template.context_processors.request',
+				'django.contrib.auth.context_processors.auth',
+				'django.contrib.messages.context_processors.messages',
+
+				'apps.core.context.add_global_context',
+				'apps.filters.context.add_global_context',
+				'apps.mails.context.add_global_context',
+				'social_django.context_processors.login_redirect',
+				'social_django.context_processors.backends',
+			],
+		},
+	},
+]
 
 STATICFILES_FINDERS = (
 	'django.contrib.staticfiles.finders.FileSystemFinder',

src/config/settings/dev.py

@@ -5,18 +5,17 @@
 # Add debug apps.
 ####
 
-INSTALLED_APPS += (
+INSTALLED_APPS += [
 	'debug_toolbar',
-	'django_extensions',
-)
+]
 
-STRONGHOLD_PUBLIC_URLS += (
+STRONGHOLD_PUBLIC_URLS += [
 	'__debug__',
-)
+]
 
-MIDDLEWARE_CLASSES += (
+MIDDLEWARE += [
 	'debug_toolbar.middleware.DebugToolbarMiddleware',
-)
+]
 
 ####
 # Broker

src/config/settings/live.py

@@ -3,12 +3,12 @@
 ####
 # Cache & Templates
 ####
-TEMPLATE_LOADERS = (
-	('django.template.loaders.cached.Loader', (
-		'django.template.loaders.filesystem.Loader',
-		'django.template.loaders.app_directories.Loader',
-	)),
-)
+# TEMPLATE_LOADERS = (
+# 	('django.template.loaders.cached.Loader', (
+# 		'django.template.loaders.filesystem.Loader',
+# 		'django.template.loaders.app_directories.Loader',
+# 	)),
+# )
 
 ####
 # Logging

src/config/settings/local.default.py

@@ -13,7 +13,6 @@
 
 # Turn debug on or off
 DEBUG = False
-TEMPLATE_DEBUG = DEBUG
 
 # Authentication options. See example for details
 # See http://psa.matiasaguirre.net/docs/index.html for details on social authentication configuration.
@@ -23,22 +22,22 @@
 		'enabled': True,
 		'backends': (
 			# Enable your backends here. Note! Only GoogleOAuth2 is fully tested!
-			'social.backends.google.GoogleOAuth2',
-			'social.backends.github.GithubOAuth2',
-			'social.backends.bitbucket.BitbucketOAuth2',
-			'social.backends.facebook.FacebookOAuth2',
-			# 'social.backends.dropbox.DropboxOAuth2',
-			# 'social.backends.flickr.FlickrOAuth',
-			# 'social.backends.instagram.InstagramOAuth2',
-			# 'social.backends.live.LiveOAuth2',
-			# 'social.backends.linkedin.LinkedinOAuth2',
-			# 'social.backends.odnoklassniki.OdnoklassnikiOAuth2',
-			# 'social.backends.reddit.RedditOAuth2',
-			# 'social.backends.soundcloud.SoundcloudOAuth2',
-			# 'social.backends.tumblr.TumblrOAuth',
-			# 'social.backends.twitter.TwitterOAuth',
-			# 'social.backends.vk.VKOAuth2',
-			# 'social.backends.yahoo.YahooOAuth',
+			'social_core.backends.google.GoogleOAuth2',
+			'social_core.backends.github.GithubOAuth2',
+			'social_core.backends.bitbucket.BitbucketOAuth2',
+			'social_core.backends.facebook.FacebookOAuth2',
+			# 'social_core.backends.dropbox.DropboxOAuth2',
+			# 'social_core.backends.flickr.FlickrOAuth',
+			# 'social_core.backends.instagram.InstagramOAuth2',
+			# 'social_core.backends.live.LiveOAuth2',
+			# 'social_core.backends.linkedin.LinkedinOAuth2',
+			# 'social_core.backends.odnoklassniki.OdnoklassnikiOAuth2',
+			# 'social_core.backends.reddit.RedditOAuth2',
+			# 'social_core.backends.soundcloud.SoundcloudOAuth2',
+			# 'social_core.backends.tumblr.TumblrOAuth',
+			# 'social_core.backends.twitter.TwitterOAuth',
+			# 'social_core.backends.vk.VKOAuth2',
+			# 'social_core.backends.yahoo.YahooOAuth',
 		),
 		'options': {
 			'SOCIAL_AUTH_GOOGLE_OAUTH2_KEY': 'key.apps.goog...',

src/config/settings/local.travis.py

@@ -16,7 +16,6 @@
 
 # Turn debug on or off
 DEBUG = True
-TEMPLATE_DEBUG = DEBUG
 
 # Authentication options. See example for details
 # See http://psa.matiasaguirre.net/docs/index.html for details on social authentication configuration.