updates for django 2 post rebase

opentech/apply/users/migrations/0004_django2_update.py → opentech/apply/activity/migrations/0004_update_on_delete_django2.py

-# Generated by Django 2.0.2 on 2018-03-01 21:46
+# Generated by Django 2.0.2 on 2018-03-13 12:12
 
+from django.conf import settings
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('users', '0003_make_email_username'),
+        ('activity', '0003_activity_visibility'),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='user',
-            name='last_name',
-            field=models.CharField(blank=True, max_length=150, verbose_name='last name'),
+            model_name='activity',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
         ),
     ]

opentech/apply/activity/models.py

@@ -52,8 +52,8 @@ class ActionManager(ActivityBaseManager):
 class Activity(models.Model):
     timestamp = models.DateTimeField(auto_now_add=True)
     type = models.CharField(choices=ACTIVITY_TYPES.items(), max_length=30)
-    user = models.ForeignKey(settings.AUTH_USER_MODEL)
-    submission = models.ForeignKey('funds.ApplicationSubmission', related_name='activities')
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT)
+    submission = models.ForeignKey('funds.ApplicationSubmission', related_name='activities', on_delete=models.CASCADE)
     message = models.TextField()
     visibility = models.CharField(choices=VISIBILITY.items(), default=PUBLIC, max_length=10)
 

opentech/apply/funds/migrations/0026_django2_update.py → opentech/apply/funds/migrations/0028_update_on_delete_django2.py

-# Generated by Django 2.0.2 on 2018-03-01 21:46
+# Generated by Django 2.0.2 on 2018-03-13 12:12
 
 from django.conf import settings
 from django.db import migrations, models
@@ -8,10 +8,15 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('funds', '0025_update_with_file_blocks'),
+        ('funds', '0027_applicationsubmission_drupal_id'),
     ]
 
     operations = [
+        migrations.AlterField(
+            model_name='applicationsubmission',
+            name='lead',
+            field=models.ForeignKey(limit_choices_to={'groups__name': 'Staff'}, on_delete=django.db.models.deletion.PROTECT, related_name='submission_lead', to=settings.AUTH_USER_MODEL),
+        ),
         migrations.AlterField(
             model_name='fundform',
             name='form',
@@ -22,6 +27,11 @@ class Migration(migrations.Migration):
             name='form',
             field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='funds.ApplicationForm'),
         ),
+        migrations.AlterField(
+            model_name='labtype',
+            name='lead',
+            field=models.ForeignKey(limit_choices_to={'groups__name': 'Staff'}, on_delete=django.db.models.deletion.PROTECT, related_name='lab_lead', to=settings.AUTH_USER_MODEL),
+        ),
         migrations.AlterField(
             model_name='round',
             name='lead',

opentech/apply/funds/models.py

@@ -386,7 +386,12 @@ class LabType(EmailForm, WorkflowStreamForm, SubmittableStreamForm):  # type: ig
     class Meta:
         verbose_name = _("Lab")
 
-    lead = models.ForeignKey(settings.AUTH_USER_MODEL, limit_choices_to={'groups__name': STAFF_GROUP_NAME}, related_name='lab_lead')
+    lead = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        limit_choices_to={'groups__name': STAFF_GROUP_NAME},
+        related_name='lab_lead',
+        on_delete=models.PROTECT,
+    )
 
     parent_page_types = ['apply_home.ApplyHomePage']
     subpage_types = []  # type: ignore
@@ -468,7 +473,12 @@ class ApplicationSubmission(WorkflowHelpers, AbstractFormSubmission):
     form_fields = StreamField(CustomFormFieldsBlock())
     page = models.ForeignKey('wagtailcore.Page', on_delete=models.PROTECT)
     round = models.ForeignKey('wagtailcore.Page', on_delete=models.PROTECT, related_name='submissions', null=True)
-    lead = models.ForeignKey(settings.AUTH_USER_MODEL, limit_choices_to={'groups__name': STAFF_GROUP_NAME}, related_name='submission_lead')
+    lead = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        limit_choices_to={'groups__name': STAFF_GROUP_NAME},
+        related_name='submission_lead',
+        on_delete=models.PROTECT,
+    )
     user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.SET_NULL, null=True)
     search_data = models.TextField()
 

requirements.txt

@@ -5,7 +5,7 @@ psycopg2==2.7.3.1
 Pillow==4.3.0
 django-bleach==0.3.0
 django-extensions==2.0.0
-django-countries==5.12.0.0
+django-countries==5.1
 Werkzeug==0.11.11
 stellar==0.4.3
 django-tinymce4-lite==1.7.0