Django 1.11 Upgrade, round 102

Pipfile

@@ -5,9 +5,9 @@ name = "pypi"
 
 [packages]
 django-filter = "==0.9.2"
-django-mptt = "==0.8.5"
+django-mptt = "==0.9.1"
 django-pg-utils = "==0.1.5"
-djangorestframework = "==3.3.3"
+djangorestframework = "==3.8.2"
 pdfkit = "==0.6.1"
 "psycopg2-binary" = "==2.7.4"
 psutil = "==3.1.1"
@@ -39,7 +39,7 @@ pathlib = "*"
 "xhtml2pdf" = "==0.2.1"
 "progressbar2" = "==3.36.0"
 python-postmark = "==0.5.0"
-Django = "==1.9.13"
+Django = "==1.11.15"
 Markdown = "==2.6.2"
 Pillow = "==5.0.0"
 Metaphone = "==0.6"

cloudbuild.yaml

@@ -20,7 +20,7 @@ steps:
   args: [
     'build',
     '-f', 'k8s/images/nginx/Dockerfile',
-    '--cache-from', 'gcr.io/$PROJECT_ID/learningequality-studio-nginx:latest', 
+    '--cache-from', 'gcr.io/$PROJECT_ID/learningequality-studio-nginx:latest',
     '-t', 'gcr.io/$PROJECT_ID/learningequality-studio-nginx:$COMMIT_SHA',
     '-t', 'gcr.io/$PROJECT_ID/learningequality-studio-nginx:latest',
     '.'
@@ -64,11 +64,22 @@ steps:
   - 'CLOUDSDK_CONTAINER_CLUSTER=dev-qa-cluster'
   secretEnv: ['POSTMARK_API_KEY']
   entrypoint: 'bash'
-  args: [
-  '-c',
-  # still run helm.bash to initialze creds, but otherwise run our own deploy script
-  '/builder/helm.bash && ./helm-deploy.sh $BRANCH_NAME studio-qa-content $COMMIT_SHA $$POSTMARK_API_KEY arontest $BRANCH_NAME arontest ops-central-studio-qa-sql-proxy-gcloud-sqlproxy.sqlproxy ../gcs-service-account.json'
-  ]
+  args:
+    - -c
+    - >
+      /builder/helm.bash &&
+      ./helm-deploy.sh
+      $BRANCH_NAME
+      studio-qa-content
+      $COMMIT_SHA
+      $$POSTMARK_API_KEY
+      arontest
+      $BRANCH_NAME
+      arontest
+      $PROJECT_ID-studio-qa-sql-proxy-gcloud-sqlproxy.sqlproxy
+      ../gcs-service-account.json
+      $PROJECT_ID
+      is_production
 
 timeout: 3600s
 secrets:
@@ -81,3 +92,4 @@ images:
   - 'gcr.io/$PROJECT_ID/learningequality-studio-nginx:latest'
   - 'gcr.io/$PROJECT_ID/learningequality-studio-app:$COMMIT_SHA'
   - 'gcr.io/$PROJECT_ID/learningequality-studio-app:latest'
+

contentcuration/contentcuration/__init__.py

@@ -3,5 +3,3 @@
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app
-
-default_app_config = "contentcuration.apps.ContentConfig"

contentcuration/contentcuration/decorators.py

@@ -2,10 +2,11 @@
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse_lazy
-from django.shortcuts import render_to_response, redirect
+from django.shortcuts import render, redirect
 from django.template import RequestContext
 from contentcuration.models import Channel
 from contentcuration.utils.policies import check_policies
+from django.shortcuts import render
 
 ACCEPTED_BROWSERS = settings.HEALTH_CHECK_BROWSERS + settings.SUPPORTED_BROWSERS
 
@@ -18,7 +19,7 @@ def wrap(request, *args, **kwargs):
             if expected_agent in user_agent_string:
                 return function(request, *args, **kwargs)
 
-        return render_to_response('unsupported_browser.html', context_instance=RequestContext(request))
+        return render(request, 'unsupported_browser.html')
 
     wrap.__doc__ = function.__doc__
     wrap.__name__ = function.__name__
@@ -30,7 +31,7 @@ def wrap(request, *args, **kwargs):
         if request.user.is_admin:
             return function(request, *args, **kwargs)
 
-        return render_to_response('unauthorized.html', context_instance=RequestContext(request), status=403)
+        return render(request, 'unauthorized.html', status=403)
 
     wrap.__doc__ = function.__doc__
     wrap.__name__ = function.__name__
@@ -41,15 +42,15 @@ def wrap(request, *args, **kwargs):
         try:
             channel = Channel.objects.get(pk=kwargs['channel_id'])
         except ObjectDoesNotExist:
-            return render_to_response('channel_not_found.html', context_instance=RequestContext(request))
+            return render(request, 'channel_not_found.html')
 
         if channel.public or \
             channel.editors.filter(id=request.user.id).exists() or \
             channel.viewers.filter(id=request.user.id).exists() or \
             request.user.is_admin:
             return function(request, *args, **kwargs)
 
-        return render_to_response('unauthorized.html', context_instance=RequestContext(request), status=403)
+        return render(request, 'unauthorized.html', status=403)
 
     wrap.__doc__ = function.__doc__
     wrap.__name__ = function.__name__
@@ -61,11 +62,11 @@ def wrap(request, *args, **kwargs):
             channel = Channel.objects.get(pk=kwargs['channel_id'], deleted=False)
 
             if not channel.editors.filter(id=request.user.id).exists() and not request.user.is_admin:
-                return render_to_response('unauthorized.html', context_instance=RequestContext(request), status=403)
+                return render(request, 'unauthorized.html', status=403)
 
             return function(request, *args, **kwargs)
         except ObjectDoesNotExist:
-            return render_to_response('channel_not_found.html', context_instance=RequestContext(request))
+            return render(request, 'channel_not_found.html')
 
     wrap.__doc__ = function.__doc__
     wrap.__name__ = function.__name__

contentcuration/contentcuration/forms.py

@@ -113,7 +113,6 @@ def __init__(self, *args, **kwargs):
         )
 
         countries = [(c.name, translator.gettext(c.name)) for c in list(pycountry.countries)]
-
         self.fields['location'] = forms.ChoiceField(required=True, widget=forms.SelectMultiple, label=_('Where do you plan to use Kolibri? (select all that apply)'), choices=countries)
 
     def clean_email(self):

contentcuration/contentcuration/migrations/0001_initial.py

@@ -91,9 +91,6 @@ class Migration(migrations.Migration):
                 'verbose_name': 'Topic',
                 'verbose_name_plural': 'Topics',
             },
-            managers=[
-                ('_default_manager', django.db.models.manager.Manager()),
-            ],
         ),
         migrations.CreateModel(
             name='ContentTag',

contentcuration/contentcuration/migrations/0093_auto_20180831_0745.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2018-08-31 07:45
+from __future__ import unicode_literals
+
+import contentcuration.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contentcuration', '0092_auto_20180731_1024'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='file',
+            name='file_on_disk',
+            field=models.FileField(blank=True, max_length=500, upload_to=contentcuration.models.object_storage_name),
+        ),
+    ]