From 8ecaa38cf67db0a9d3bc1514c08c5ad19456a8e2 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 21 Mar 2018 18:02:53 +0100 Subject: Fix migrations - refs #3975 --- .../migrations/0034_auto_20180308_1828.py | 35 ---------------------- .../migrations/0035_auto_20180308_1828.py | 20 +++++++++++++ 2 files changed, 20 insertions(+), 35 deletions(-) delete mode 100644 ishtar_common/migrations/0034_auto_20180308_1828.py create mode 100644 ishtar_common/migrations/0035_auto_20180308_1828.py (limited to 'ishtar_common') diff --git a/ishtar_common/migrations/0034_auto_20180308_1828.py b/ishtar_common/migrations/0034_auto_20180308_1828.py deleted file mode 100644 index 473298eb4..000000000 --- a/ishtar_common/migrations/0034_auto_20180308_1828.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-03-08 18:28 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0033_auto_20180306_1054'), - ] - - operations = [ - migrations.AddField( - model_name='import', - name='current_line', - field=models.IntegerField(blank=True, null=True, verbose_name='Current line'), - ), - migrations.AlterField( - model_name='import', - name='end_date', - field=models.DateTimeField(auto_now_add=True, null=True, verbose_name='End date'), - ), - migrations.AlterField( - model_name='import', - name='state', - field=models.CharField(choices=[(b'C', 'Created'), (b'AP', 'Analyse in progress'), (b'A', 'Analysed'), (b'P', 'Import pending'), (b'IQ', 'Import in queue'), (b'IP', 'Import in progress'), (b'FE', 'Finished with errors'), (b'F', 'Finished'), (b'AC', 'Archived')], default='C', max_length=2, verbose_name='State'), - ), - migrations.AlterField( - model_name='ishtarsiteprofile', - name='archaeological_site_label', - field=models.CharField(choices=[(b'site', 'Site'), (b'entity', 'Archaeological entity')], default=b'site', max_length=200, verbose_name='Archaeological site type'), - ), - ] diff --git a/ishtar_common/migrations/0035_auto_20180308_1828.py b/ishtar_common/migrations/0035_auto_20180308_1828.py new file mode 100644 index 000000000..62c5f2f0f --- /dev/null +++ b/ishtar_common/migrations/0035_auto_20180308_1828.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-03-08 18:28 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0034_auto_20180315_1000'), + ] + + operations = [ + migrations.AddField( + model_name='import', + name='current_line', + field=models.IntegerField(blank=True, null=True, verbose_name='Current line'), + ), + ] -- cgit v1.2.3