From 2287f9bbf0b8836aadc1f32a9a90203f1886d26d Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 6 Feb 2019 16:17:58 +0100 Subject: Merge migrations --- .../migrations/0039_auto_20190122_1550.py | 87 ---------------------- .../migrations/0040_auto_20190206_1423.py | 35 --------- .../migrations/0041_auto_20190122_1550.py | 87 ++++++++++++++++++++++ .../migrations/0042_auto_20190206_1423.py | 35 +++++++++ 4 files changed, 122 insertions(+), 122 deletions(-) delete mode 100644 archaeological_context_records/migrations/0039_auto_20190122_1550.py delete mode 100644 archaeological_context_records/migrations/0040_auto_20190206_1423.py create mode 100644 archaeological_context_records/migrations/0041_auto_20190122_1550.py create mode 100644 archaeological_context_records/migrations/0042_auto_20190206_1423.py (limited to 'archaeological_context_records/migrations') diff --git a/archaeological_context_records/migrations/0039_auto_20190122_1550.py b/archaeological_context_records/migrations/0039_auto_20190122_1550.py deleted file mode 100644 index 05d12abc4..000000000 --- a/archaeological_context_records/migrations/0039_auto_20190122_1550.py +++ /dev/null @@ -1,87 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-01-22 15:50 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0084_ishtarsiteprofile_use_town_for_geo'), - ('archaeological_context_records', '0038_migrate_main_image'), - ] - - operations = [ - migrations.AddField( - model_name='contextrecord', - name='estimated_error_x', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), - ), - migrations.AddField( - model_name='contextrecord', - name='estimated_error_y', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), - ), - migrations.AddField( - model_name='contextrecord', - name='estimated_error_z', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), - ), - migrations.AddField( - model_name='contextrecord', - name='spatial_reference_system', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.SpatialReferenceSystem', verbose_name='Syst\xe8me de r\xe9f\xe9rence spatiale'), - ), - migrations.AddField( - model_name='contextrecord', - name='x', - field=models.FloatField(blank=True, null=True, verbose_name='X'), - ), - migrations.AddField( - model_name='contextrecord', - name='y', - field=models.FloatField(blank=True, null=True, verbose_name='Y'), - ), - migrations.AddField( - model_name='contextrecord', - name='z', - field=models.FloatField(blank=True, null=True, verbose_name='Z'), - ), - migrations.AddField( - model_name='historicalcontextrecord', - name='estimated_error_x', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), - ), - migrations.AddField( - model_name='historicalcontextrecord', - name='estimated_error_y', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), - ), - migrations.AddField( - model_name='historicalcontextrecord', - name='estimated_error_z', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), - ), - migrations.AddField( - model_name='historicalcontextrecord', - name='spatial_reference_system', - field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.SpatialReferenceSystem'), - ), - migrations.AddField( - model_name='historicalcontextrecord', - name='x', - field=models.FloatField(blank=True, null=True, verbose_name='X'), - ), - migrations.AddField( - model_name='historicalcontextrecord', - name='y', - field=models.FloatField(blank=True, null=True, verbose_name='Y'), - ), - migrations.AddField( - model_name='historicalcontextrecord', - name='z', - field=models.FloatField(blank=True, null=True, verbose_name='Z'), - ), - ] 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_context_records/migrations/0041_auto_20190122_1550.py b/archaeological_context_records/migrations/0041_auto_20190122_1550.py new file mode 100644 index 000000000..5931083eb --- /dev/null +++ b/archaeological_context_records/migrations/0041_auto_20190122_1550.py @@ -0,0 +1,87 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-01-22 15:50 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0085_ishtarsiteprofile_use_town_for_geo'), + ('archaeological_context_records', '0040_auto_20190206_1522'), + ] + + operations = [ + migrations.AddField( + model_name='contextrecord', + name='estimated_error_x', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), + ), + migrations.AddField( + model_name='contextrecord', + name='estimated_error_y', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), + ), + migrations.AddField( + model_name='contextrecord', + name='estimated_error_z', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), + ), + migrations.AddField( + model_name='contextrecord', + name='spatial_reference_system', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.SpatialReferenceSystem', verbose_name='Syst\xe8me de r\xe9f\xe9rence spatiale'), + ), + migrations.AddField( + model_name='contextrecord', + name='x', + field=models.FloatField(blank=True, null=True, verbose_name='X'), + ), + migrations.AddField( + model_name='contextrecord', + name='y', + field=models.FloatField(blank=True, null=True, verbose_name='Y'), + ), + migrations.AddField( + model_name='contextrecord', + name='z', + field=models.FloatField(blank=True, null=True, verbose_name='Z'), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='estimated_error_x', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='estimated_error_y', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='estimated_error_z', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='spatial_reference_system', + field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.SpatialReferenceSystem'), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='x', + field=models.FloatField(blank=True, null=True, verbose_name='X'), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='y', + field=models.FloatField(blank=True, null=True, verbose_name='Y'), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='z', + field=models.FloatField(blank=True, null=True, verbose_name='Z'), + ), + ] diff --git a/archaeological_context_records/migrations/0042_auto_20190206_1423.py b/archaeological_context_records/migrations/0042_auto_20190206_1423.py new file mode 100644 index 000000000..a3bfc70d4 --- /dev/null +++ b/archaeological_context_records/migrations/0042_auto_20190206_1423.py @@ -0,0 +1,35 @@ +# -*- 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', '0041_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'), + ), + ] -- cgit v1.2.3