Fix migrations after rebase

4 files changed, 1 insertions, 126 deletions

diff --git a/Makefile.example b/Makefile.example
index 3ad0fb71c..70eb78424 100644
--- a/Makefile.example
+++ b/Makefile.example
@@ -42,7 +42,7 @@ clean:
 	-rm -rf *~*
 	-find . -name '*.pyc' -exec rm {} \;
 	-find . -name '.*.swp' -exec rm {} \;
-	-find . -name "__pycache__" -exec rm -rf {} \; 2> /dev/null
+	-find . -name '__pycache__' -exec rm -rf {} \; 2> /dev/null
 	-rm -rf dist ishtar.egg-info
 
 update: clean syncdb compilemessages collectstatic
diff --git a/archaeological_context_records/migrations/0040_auto_20190206_1423.py b/archaeological_context_records/migrations/0040_auto_20190206_1423.py
deleted file mode 100644
index b3c5a6837..000000000
--- a/archaeological_context_records/migrations/0040_auto_20190206_1423.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2019-02-06 14:23
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('archaeological_context_records', '0039_auto_20190122_1550'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='contextrecord',
-            name='multi_polygon_source',
-            field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'),
-        ),
-        migrations.AddField(
-            model_name='contextrecord',
-            name='point_source',
-            field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'),
-        ),
-        migrations.AddField(
-            model_name='historicalcontextrecord',
-            name='multi_polygon_source',
-            field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'),
-        ),
-        migrations.AddField(
-            model_name='historicalcontextrecord',
-            name='point_source',
-            field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'),
-        ),
-    ]
diff --git a/archaeological_finds/migrations/0060_auto_20190206_1423.py b/archaeological_finds/migrations/0060_auto_20190206_1423.py
deleted file mode 100644
index 6ddfa5145..000000000
--- a/archaeological_finds/migrations/0060_auto_20190206_1423.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2019-02-06 14:23
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('archaeological_finds', '0059_auto_20190204_1134'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='basefind',
-            name='multi_polygon_source',
-            field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'),
-        ),
-        migrations.AddField(
-            model_name='basefind',
-            name='point_source',
-            field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'),
-        ),
-        migrations.AddField(
-            model_name='historicalbasefind',
-            name='multi_polygon_source',
-            field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'),
-        ),
-        migrations.AddField(
-            model_name='historicalbasefind',
-            name='point_source',
-            field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'),
-        ),
-    ]
diff --git a/archaeological_operations/migrations/0050_auto_20190206_1423.py b/archaeological_operations/migrations/0050_auto_20190206_1423.py
deleted file mode 100644
index a632b6059..000000000
--- a/archaeological_operations/migrations/0050_auto_20190206_1423.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2019-02-06 14:23
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('archaeological_operations', '0049_auto_20190122_1621'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='archaeologicalsite',
-            name='multi_polygon_source',
-            field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'),
-        ),
-        migrations.AddField(
-            model_name='archaeologicalsite',
-            name='point_source',
-            field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'),
-        ),
-        migrations.AddField(
-            model_name='historicalarchaeologicalsite',
-            name='multi_polygon_source',
-            field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'),
-        ),
-        migrations.AddField(
-            model_name='historicalarchaeologicalsite',
-            name='point_source',
-            field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'),
-        ),
-        migrations.AddField(
-            model_name='historicaloperation',
-            name='multi_polygon_source',
-            field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'),
-        ),
-        migrations.AddField(
-            model_name='historicaloperation',
-            name='point_source',
-            field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'),
-        ),
-        migrations.AddField(
-            model_name='operation',
-            name='multi_polygon_source',
-            field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'),
-        ),
-        migrations.AddField(
-            model_name='operation',
-            name='point_source',
-            field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'),
-        ),
-    ]