From dfc86e4eecdc8c2ba2244824087f015ae74ac164 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Fri, 20 Oct 2017 09:00:45 +0200
Subject: [PATCH] Fix migrations issues

---
 colleges/migrations/0001_initial.py           |  8 +--
 .../migrations/0002_auto_20171014_0938.py     | 23 -------
 .../migrations/0003_auto_20171014_1519.py     | 19 ------
 .../0004_remove_fellowship_affiliation.py     | 19 ------
 colleges/migrations/0005_fellowship_guest.py  | 20 ------
 proceedings/migrations/0001_initial.py        | 30 +++++++--
 .../migrations/0002_auto_20171015_2235.py     | 39 -----------
 .../migrations/0003_auto_20171019_1942.py     | 32 ---------
 .../migrations/0004_auto_20171019_1944.py     | 19 ------
 .../migrations/0005_auto_20171019_1950.py     | 25 -------
 .../migrations/0006_auto_20171019_1956.py     | 65 -------------------
 .../migrations/0077_auto_20171020_0900.py     | 33 ++++++++++
 .../migrations/0077_submission_pool.py        | 21 ------
 .../migrations/0078_auto_20171014_0945.py     | 33 ----------
 .../migrations/0079_auto_20171014_0951.py     | 20 ------
 .../migrations/0080_submission_proceedings.py | 22 -------
 .../migrations/0081_auto_20171015_2240.py     | 20 ------
 .../migrations/0082_auto_20171019_1942.py     | 20 ------
 .../migrations/0083_auto_20171019_1944.py     | 20 ------
 19 files changed, 61 insertions(+), 427 deletions(-)
 delete mode 100644 colleges/migrations/0002_auto_20171014_0938.py
 delete mode 100644 colleges/migrations/0003_auto_20171014_1519.py
 delete mode 100644 colleges/migrations/0004_remove_fellowship_affiliation.py
 delete mode 100644 colleges/migrations/0005_fellowship_guest.py
 delete mode 100644 proceedings/migrations/0002_auto_20171015_2235.py
 delete mode 100644 proceedings/migrations/0003_auto_20171019_1942.py
 delete mode 100644 proceedings/migrations/0004_auto_20171019_1944.py
 delete mode 100644 proceedings/migrations/0005_auto_20171019_1950.py
 delete mode 100644 proceedings/migrations/0006_auto_20171019_1956.py
 create mode 100644 submissions/migrations/0077_auto_20171020_0900.py
 delete mode 100644 submissions/migrations/0077_submission_pool.py
 delete mode 100644 submissions/migrations/0078_auto_20171014_0945.py
 delete mode 100644 submissions/migrations/0079_auto_20171014_0951.py
 delete mode 100644 submissions/migrations/0080_submission_proceedings.py
 delete mode 100644 submissions/migrations/0081_auto_20171015_2240.py
 delete mode 100644 submissions/migrations/0082_auto_20171019_1942.py
 delete mode 100644 submissions/migrations/0083_auto_20171019_1944.py

diff --git a/colleges/migrations/0001_initial.py b/colleges/migrations/0001_initial.py
index 2b4a744ee..d7f01c265 100644
--- a/colleges/migrations/0001_initial.py
+++ b/colleges/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-14 07:37
+# Generated by Django 1.11.4 on 2017-10-20 07:00
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -18,19 +18,19 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='EditorialCollegeFellowship',
+            name='Fellowship',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('created', models.DateTimeField(default=django.utils.timezone.now)),
                 ('latest_activity', scipost.db.fields.AutoDateTimeField(blank=True, default=django.utils.timezone.now, editable=False)),
-                ('affiliation', models.CharField(blank=True, max_length=255)),
                 ('start_date', models.DateField(blank=True, null=True)),
                 ('until_date', models.DateField(blank=True, null=True)),
+                ('guest', models.BooleanField(default=False, verbose_name='Guest Fellowship')),
                 ('contributor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='fellowships', to='scipost.Contributor')),
             ],
         ),
         migrations.AlterUniqueTogether(
-            name='editorialcollegefellowship',
+            name='fellowship',
             unique_together=set([('contributor', 'start_date', 'until_date')]),
         ),
     ]
diff --git a/colleges/migrations/0002_auto_20171014_0938.py b/colleges/migrations/0002_auto_20171014_0938.py
deleted file mode 100644
index 287565c60..000000000
--- a/colleges/migrations/0002_auto_20171014_0938.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-14 07:38
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-def fill_editorial_college(apps, schema_editor):
-    Fellowship = apps.get_model('colleges', 'EditorialCollegeFellowship')
-    Contributor = apps.get_model('scipost', 'Contributor')
-    for contributor in Contributor.objects.filter(user__groups__name='Editorial College'):
-        Fellowship.objects.get_or_create(contributor=contributor)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('colleges', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RunPython(fill_editorial_college),
-    ]
diff --git a/colleges/migrations/0003_auto_20171014_1519.py b/colleges/migrations/0003_auto_20171014_1519.py
deleted file mode 100644
index fc3b1347d..000000000
--- a/colleges/migrations/0003_auto_20171014_1519.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-14 13:19
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('colleges', '0002_auto_20171014_0938'),
-    ]
-
-    operations = [
-        migrations.RenameModel(
-            old_name='EditorialCollegeFellowship',
-            new_name='Fellowship',
-        ),
-    ]
diff --git a/colleges/migrations/0004_remove_fellowship_affiliation.py b/colleges/migrations/0004_remove_fellowship_affiliation.py
deleted file mode 100644
index 97523d350..000000000
--- a/colleges/migrations/0004_remove_fellowship_affiliation.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-14 14:36
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('colleges', '0003_auto_20171014_1519'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='fellowship',
-            name='affiliation',
-        ),
-    ]
diff --git a/colleges/migrations/0005_fellowship_guest.py b/colleges/migrations/0005_fellowship_guest.py
deleted file mode 100644
index 36a451c31..000000000
--- a/colleges/migrations/0005_fellowship_guest.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-15 20:08
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('colleges', '0004_remove_fellowship_affiliation'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='fellowship',
-            name='guest',
-            field=models.BooleanField(default=False, verbose_name='Guest Fellowship'),
-        ),
-    ]
diff --git a/proceedings/migrations/0001_initial.py b/proceedings/migrations/0001_initial.py
index e002e8846..32cf6e68f 100644
--- a/proceedings/migrations/0001_initial.py
+++ b/proceedings/migrations/0001_initial.py
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-15 20:31
+# Generated by Django 1.11.4 on 2017-10-20 07:00
 from __future__ import unicode_literals
 
 from django.db import migrations, models
 import django.db.models.deletion
+import django.utils.timezone
+import scipost.db.fields
 
 
 class Migration(migrations.Migration):
@@ -11,17 +13,33 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('journals', '0045_auto_20170925_2124'),
+        ('colleges', '0001_initial'),
+        ('journals', '0046_auto_20171019_1942'),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Proceeding',
+            name='Proceedings',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=256)),
-                ('open_for_submission', models.BooleanField(default=True)),
-                ('journal', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='journals.Journal')),
+                ('created', models.DateTimeField(default=django.utils.timezone.now)),
+                ('latest_activity', scipost.db.fields.AutoDateTimeField(blank=True, default=django.utils.timezone.now, editable=False)),
+                ('issue_name', models.CharField(max_length=256)),
+                ('event_name', models.CharField(blank=True, max_length=256)),
+                ('event_description', models.TextField(blank=True)),
+                ('event_start_date', models.DateField(blank=True, null=True)),
+                ('event_end_date', models.DateField(blank=True, null=True)),
+                ('submissions_open', models.DateField()),
+                ('submissions_deadline', models.DateField()),
+                ('submissions_close', models.DateField()),
+                ('fellowships', models.ManyToManyField(blank=True, related_name='proceedings', to='colleges.Fellowship')),
+                ('issue', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='proceedings', to='journals.Issue')),
+                ('lead_fellow', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='colleges.Fellowship')),
             ],
+            options={
+                'verbose_name': 'Proceedings',
+                'verbose_name_plural': 'Proceedings',
+                'default_related_name': 'proceedings',
+            },
         ),
     ]
diff --git a/proceedings/migrations/0002_auto_20171015_2235.py b/proceedings/migrations/0002_auto_20171015_2235.py
deleted file mode 100644
index ec27ccfd6..000000000
--- a/proceedings/migrations/0002_auto_20171015_2235.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-15 20:35
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.timezone
-import scipost.db.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('colleges', '0005_fellowship_guest'),
-        ('proceedings', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='proceeding',
-            name='created',
-            field=models.DateTimeField(default=django.utils.timezone.now),
-        ),
-        migrations.AddField(
-            model_name='proceeding',
-            name='fellowships',
-            field=models.ManyToManyField(blank=True, related_name='proceedings', to='colleges.Fellowship'),
-        ),
-        migrations.AddField(
-            model_name='proceeding',
-            name='latest_activity',
-            field=scipost.db.fields.AutoDateTimeField(blank=True, default=django.utils.timezone.now, editable=False),
-        ),
-        migrations.AlterField(
-            model_name='proceeding',
-            name='journal',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='proceedings', to='journals.Journal'),
-        ),
-    ]
diff --git a/proceedings/migrations/0003_auto_20171019_1942.py b/proceedings/migrations/0003_auto_20171019_1942.py
deleted file mode 100644
index 128dae54c..000000000
--- a/proceedings/migrations/0003_auto_20171019_1942.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-19 17:42
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('journals', '0046_auto_20171019_1942'),
-        ('proceedings', '0002_auto_20171015_2235'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='proceeding',
-            old_name='name',
-            new_name='issue_name',
-        ),
-        migrations.RemoveField(
-            model_name='proceeding',
-            name='journal',
-        ),
-        migrations.AddField(
-            model_name='proceeding',
-            name='issue',
-            field=models.ForeignKey(default=114, on_delete=django.db.models.deletion.CASCADE, related_name='proceedings', to='journals.Issue'),
-            preserve_default=False,
-        ),
-    ]
diff --git a/proceedings/migrations/0004_auto_20171019_1944.py b/proceedings/migrations/0004_auto_20171019_1944.py
deleted file mode 100644
index 7313627d3..000000000
--- a/proceedings/migrations/0004_auto_20171019_1944.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-19 17:44
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('proceedings', '0003_auto_20171019_1942'),
-    ]
-
-    operations = [
-        migrations.RenameModel(
-            old_name='Proceeding',
-            new_name='Proceedings',
-        ),
-    ]
diff --git a/proceedings/migrations/0005_auto_20171019_1950.py b/proceedings/migrations/0005_auto_20171019_1950.py
deleted file mode 100644
index ca5956275..000000000
--- a/proceedings/migrations/0005_auto_20171019_1950.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-19 17:50
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('proceedings', '0004_auto_20171019_1944'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='proceedings',
-            options={'verbose_name': 'Proceedings', 'verbose_name_plural': 'Proceedings'},
-        ),
-        migrations.AlterField(
-            model_name='proceedings',
-            name='issue',
-            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='proceedings', to='journals.Issue'),
-        ),
-    ]
diff --git a/proceedings/migrations/0006_auto_20171019_1956.py b/proceedings/migrations/0006_auto_20171019_1956.py
deleted file mode 100644
index 32df292f9..000000000
--- a/proceedings/migrations/0006_auto_20171019_1956.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-19 17:56
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.datetime_safe
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('colleges', '0005_fellowship_guest'),
-        ('proceedings', '0005_auto_20171019_1950'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='proceedings',
-            name='open_for_submission',
-        ),
-        migrations.AddField(
-            model_name='proceedings',
-            name='event_description',
-            field=models.TextField(blank=True),
-        ),
-        migrations.AddField(
-            model_name='proceedings',
-            name='event_end_date',
-            field=models.DateField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='proceedings',
-            name='event_name',
-            field=models.CharField(blank=True, max_length=256),
-        ),
-        migrations.AddField(
-            model_name='proceedings',
-            name='event_start_date',
-            field=models.DateField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='proceedings',
-            name='lead_fellow',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='colleges.Fellowship'),
-        ),
-        migrations.AddField(
-            model_name='proceedings',
-            name='submissions_close',
-            field=models.DateField(default=django.utils.datetime_safe.date.today),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='proceedings',
-            name='submissions_deadline',
-            field=models.DateField(default=django.utils.datetime_safe.date.today),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='proceedings',
-            name='submissions_open',
-            field=models.DateField(default=django.utils.datetime_safe.date.today),
-            preserve_default=False,
-        ),
-    ]
diff --git a/submissions/migrations/0077_auto_20171020_0900.py b/submissions/migrations/0077_auto_20171020_0900.py
new file mode 100644
index 000000000..26df6de62
--- /dev/null
+++ b/submissions/migrations/0077_auto_20171020_0900.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-10-20 07:00
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('colleges', '0001_initial'),
+        ('proceedings', '0001_initial'),
+        ('submissions', '0076_auto_20170928_2024'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='submission',
+            name='fellows',
+            field=models.ManyToManyField(blank=True, related_name='pool', to='colleges.Fellowship'),
+        ),
+        migrations.AddField(
+            model_name='submission',
+            name='proceedings',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='submissions', to='proceedings.Proceedings'),
+        ),
+        migrations.AlterField(
+            model_name='submission',
+            name='submitted_to_journal',
+            field=models.CharField(choices=[('SciPostPhys', 'SciPost Physics'), ('SciPostPhysLectNotes', 'SciPost Physics Lecture Notes'), ('SciPostPhysProc', 'SciPost Proceedings')], max_length=30, verbose_name='Journal to be submitted to'),
+        ),
+    ]
diff --git a/submissions/migrations/0077_submission_pool.py b/submissions/migrations/0077_submission_pool.py
deleted file mode 100644
index 8380ca3b3..000000000
--- a/submissions/migrations/0077_submission_pool.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-14 07:37
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('colleges', '0001_initial'),
-        ('submissions', '0076_auto_20170928_2024'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='submission',
-            name='pool',
-            field=models.ManyToManyField(blank=True, related_name='pool', to='colleges.Fellowship'),
-        ),
-    ]
diff --git a/submissions/migrations/0078_auto_20171014_0945.py b/submissions/migrations/0078_auto_20171014_0945.py
deleted file mode 100644
index 9ecef592c..000000000
--- a/submissions/migrations/0078_auto_20171014_0945.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-14 07:45
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-def fill_editorial_college(apps, schema_editor):
-    Fellowship = apps.get_model('colleges', 'EditorialCollegeFellowship')
-    Submission = apps.get_model('submissions', 'Submission')
-    fellows = Fellowship.objects.all()
-
-    for submission in Submission.objects.all():
-        for fellow in fellows:
-            cont = fellow.contributor
-            if cont not in submission.authors.all() and cont not in submission.authors_claims.all() and (cont.user.last_name not in submission.author_list or cont in submission.authors_false_claims.all()):
-                submission.pool.add(fellow)
-
-
-def no_going_back(apps, schema_editor):
-    pass
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('submissions', '0077_submission_pool'),
-        ('colleges', '0002_auto_20171014_0938'),
-    ]
-
-    operations = [
-        migrations.RunPython(fill_editorial_college, no_going_back),
-    ]
diff --git a/submissions/migrations/0079_auto_20171014_0951.py b/submissions/migrations/0079_auto_20171014_0951.py
deleted file mode 100644
index d31aae4dd..000000000
--- a/submissions/migrations/0079_auto_20171014_0951.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-14 07:51
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('submissions', '0078_auto_20171014_0945'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='submission',
-            old_name='pool',
-            new_name='fellows',
-        ),
-    ]
diff --git a/submissions/migrations/0080_submission_proceedings.py b/submissions/migrations/0080_submission_proceedings.py
deleted file mode 100644
index 1e4f694a7..000000000
--- a/submissions/migrations/0080_submission_proceedings.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-15 20:31
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('proceedings', '0001_initial'),
-        ('submissions', '0079_auto_20171014_0951'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='submission',
-            name='proceedings',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='submissions', to='proceedings.Proceedings'),
-        ),
-    ]
diff --git a/submissions/migrations/0081_auto_20171015_2240.py b/submissions/migrations/0081_auto_20171015_2240.py
deleted file mode 100644
index c8183ec62..000000000
--- a/submissions/migrations/0081_auto_20171015_2240.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-15 20:40
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('submissions', '0080_submission_proceedings'),
-    ]
-
-    operations = [
-        # migrations.RenameField(
-        #     model_name='submission',
-        #     old_name='proceedings',
-        #     new_name='proceeding',
-        # ),
-    ]
diff --git a/submissions/migrations/0082_auto_20171019_1942.py b/submissions/migrations/0082_auto_20171019_1942.py
deleted file mode 100644
index 7187f46cd..000000000
--- a/submissions/migrations/0082_auto_20171019_1942.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-19 17:42
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('submissions', '0081_auto_20171015_2240'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='submission',
-            name='submitted_to_journal',
-            field=models.CharField(choices=[('SciPostPhys', 'SciPost Physics'), ('SciPostPhysLectNotes', 'SciPost Physics Lecture Notes'), ('SciPostPhysProc', 'SciPost Proceedings')], max_length=30, verbose_name='Journal to be submitted to'),
-        ),
-    ]
diff --git a/submissions/migrations/0083_auto_20171019_1944.py b/submissions/migrations/0083_auto_20171019_1944.py
deleted file mode 100644
index 4ed13f041..000000000
--- a/submissions/migrations/0083_auto_20171019_1944.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-19 17:44
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('submissions', '0082_auto_20171019_1942'),
-    ]
-
-    operations = [
-        # migrations.RenameField(
-        #     model_name='submission',
-        #     old_name='proceeding',
-        #     new_name='proceedings',
-        # ),
-    ]
-- 
GitLab