From 7d5f17055e8bfa004ef45c174b9f767bc561d205 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 4 Feb 2019 09:51:30 +0100 Subject: Post-merge: migrations --- .../migrations/0046_auto_20190122_1550.py | 178 --------------------- .../migrations/0047_auto_20190122_1550.py | 178 +++++++++++++++++++++ .../migrations/0047_point_to_point_2d.py | 27 ---- .../migrations/0048_auto_20190122_1621.py | 36 ----- .../migrations/0048_point_to_point_2d.py | 27 ++++ .../migrations/0049_auto_20190122_1621.py | 36 +++++ 6 files changed, 241 insertions(+), 241 deletions(-) delete mode 100644 archaeological_operations/migrations/0046_auto_20190122_1550.py create mode 100644 archaeological_operations/migrations/0047_auto_20190122_1550.py delete mode 100644 archaeological_operations/migrations/0047_point_to_point_2d.py delete mode 100644 archaeological_operations/migrations/0048_auto_20190122_1621.py create mode 100644 archaeological_operations/migrations/0048_point_to_point_2d.py create mode 100644 archaeological_operations/migrations/0049_auto_20190122_1621.py (limited to 'archaeological_operations') diff --git a/archaeological_operations/migrations/0046_auto_20190122_1550.py b/archaeological_operations/migrations/0046_auto_20190122_1550.py deleted file mode 100644 index 4a352a970..000000000 --- a/archaeological_operations/migrations/0046_auto_20190122_1550.py +++ /dev/null @@ -1,178 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-01-22 15:50 -from __future__ import unicode_literals - -import django.contrib.gis.db.models.fields -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_operations', '0045_auto_20190118_1203'), - ] - - operations = [ - migrations.AddField( - model_name='archaeologicalsite', - name='estimated_error_x', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), - ), - migrations.AddField( - model_name='archaeologicalsite', - name='estimated_error_y', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), - ), - migrations.AddField( - model_name='archaeologicalsite', - name='estimated_error_z', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), - ), - migrations.AddField( - model_name='archaeologicalsite', - name='point_2d', - field=django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326, verbose_name='Point (2D)'), - ), - migrations.AddField( - model_name='archaeologicalsite', - 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='archaeologicalsite', - name='x', - field=models.FloatField(blank=True, null=True, verbose_name='X'), - ), - migrations.AddField( - model_name='archaeologicalsite', - name='y', - field=models.FloatField(blank=True, null=True, verbose_name='Y'), - ), - migrations.AddField( - model_name='archaeologicalsite', - name='z', - field=models.FloatField(blank=True, null=True, verbose_name='Z'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='estimated_error_x', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='estimated_error_y', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='estimated_error_z', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='point_2d', - field=django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326, verbose_name='Point (2D)'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - 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='historicalarchaeologicalsite', - name='x', - field=models.FloatField(blank=True, null=True, verbose_name='X'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='y', - field=models.FloatField(blank=True, null=True, verbose_name='Y'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='z', - field=models.FloatField(blank=True, null=True, verbose_name='Z'), - ), - migrations.AddField( - model_name='historicaloperation', - name='estimated_error_x', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), - ), - migrations.AddField( - model_name='historicaloperation', - name='estimated_error_y', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), - ), - migrations.AddField( - model_name='historicaloperation', - name='estimated_error_z', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), - ), - migrations.AddField( - model_name='historicaloperation', - name='point_2d', - field=django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326, verbose_name='Point (2D)'), - ), - migrations.AddField( - model_name='historicaloperation', - 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='historicaloperation', - name='x', - field=models.FloatField(blank=True, null=True, verbose_name='X'), - ), - migrations.AddField( - model_name='historicaloperation', - name='y', - field=models.FloatField(blank=True, null=True, verbose_name='Y'), - ), - migrations.AddField( - model_name='historicaloperation', - name='z', - field=models.FloatField(blank=True, null=True, verbose_name='Z'), - ), - migrations.AddField( - model_name='operation', - name='estimated_error_x', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), - ), - migrations.AddField( - model_name='operation', - name='estimated_error_y', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), - ), - migrations.AddField( - model_name='operation', - name='estimated_error_z', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), - ), - migrations.AddField( - model_name='operation', - name='point_2d', - field=django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326, verbose_name='Point (2D)'), - ), - migrations.AddField( - model_name='operation', - 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='operation', - name='x', - field=models.FloatField(blank=True, null=True, verbose_name='X'), - ), - migrations.AddField( - model_name='operation', - name='y', - field=models.FloatField(blank=True, null=True, verbose_name='Y'), - ), - migrations.AddField( - model_name='operation', - name='z', - field=models.FloatField(blank=True, null=True, verbose_name='Z'), - ), - ] diff --git a/archaeological_operations/migrations/0047_auto_20190122_1550.py b/archaeological_operations/migrations/0047_auto_20190122_1550.py new file mode 100644 index 000000000..628a997c6 --- /dev/null +++ b/archaeological_operations/migrations/0047_auto_20190122_1550.py @@ -0,0 +1,178 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-01-22 15:50 +from __future__ import unicode_literals + +import django.contrib.gis.db.models.fields +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_operations', '0046_migrate_main_image'), + ] + + operations = [ + migrations.AddField( + model_name='archaeologicalsite', + name='estimated_error_x', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), + ), + migrations.AddField( + model_name='archaeologicalsite', + name='estimated_error_y', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), + ), + migrations.AddField( + model_name='archaeologicalsite', + name='estimated_error_z', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), + ), + migrations.AddField( + model_name='archaeologicalsite', + name='point_2d', + field=django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326, verbose_name='Point (2D)'), + ), + migrations.AddField( + model_name='archaeologicalsite', + 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='archaeologicalsite', + name='x', + field=models.FloatField(blank=True, null=True, verbose_name='X'), + ), + migrations.AddField( + model_name='archaeologicalsite', + name='y', + field=models.FloatField(blank=True, null=True, verbose_name='Y'), + ), + migrations.AddField( + model_name='archaeologicalsite', + name='z', + field=models.FloatField(blank=True, null=True, verbose_name='Z'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='estimated_error_x', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='estimated_error_y', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='estimated_error_z', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='point_2d', + field=django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326, verbose_name='Point (2D)'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + 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='historicalarchaeologicalsite', + name='x', + field=models.FloatField(blank=True, null=True, verbose_name='X'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='y', + field=models.FloatField(blank=True, null=True, verbose_name='Y'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='z', + field=models.FloatField(blank=True, null=True, verbose_name='Z'), + ), + migrations.AddField( + model_name='historicaloperation', + name='estimated_error_x', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), + ), + migrations.AddField( + model_name='historicaloperation', + name='estimated_error_y', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), + ), + migrations.AddField( + model_name='historicaloperation', + name='estimated_error_z', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), + ), + migrations.AddField( + model_name='historicaloperation', + name='point_2d', + field=django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326, verbose_name='Point (2D)'), + ), + migrations.AddField( + model_name='historicaloperation', + 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='historicaloperation', + name='x', + field=models.FloatField(blank=True, null=True, verbose_name='X'), + ), + migrations.AddField( + model_name='historicaloperation', + name='y', + field=models.FloatField(blank=True, null=True, verbose_name='Y'), + ), + migrations.AddField( + model_name='historicaloperation', + name='z', + field=models.FloatField(blank=True, null=True, verbose_name='Z'), + ), + migrations.AddField( + model_name='operation', + name='estimated_error_x', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), + ), + migrations.AddField( + model_name='operation', + name='estimated_error_y', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), + ), + migrations.AddField( + model_name='operation', + name='estimated_error_z', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), + ), + migrations.AddField( + model_name='operation', + name='point_2d', + field=django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326, verbose_name='Point (2D)'), + ), + migrations.AddField( + model_name='operation', + 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='operation', + name='x', + field=models.FloatField(blank=True, null=True, verbose_name='X'), + ), + migrations.AddField( + model_name='operation', + name='y', + field=models.FloatField(blank=True, null=True, verbose_name='Y'), + ), + migrations.AddField( + model_name='operation', + name='z', + field=models.FloatField(blank=True, null=True, verbose_name='Z'), + ), + ] diff --git a/archaeological_operations/migrations/0047_point_to_point_2d.py b/archaeological_operations/migrations/0047_point_to_point_2d.py deleted file mode 100644 index 7750fb88a..000000000 --- a/archaeological_operations/migrations/0047_point_to_point_2d.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-01-22 15:54 -from __future__ import unicode_literals - -from django.db import migrations - - -def point_to_point_2d(apps, schema_editor): - ArchaeologicalSite = apps.get_model( - 'archaeological_operations', 'ArchaeologicalSite') - Operation = apps.get_model('archaeological_operations', 'Operation') - for kls in [ArchaeologicalSite, Operation]: - for item in kls.objects.exclude(point__isnull=True).all(): - item.point_2d = item.point - item.point = None - item.save() - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_operations', '0046_auto_20190122_1550'), - ] - - operations = [ - migrations.RunPython(point_to_point_2d) - ] diff --git a/archaeological_operations/migrations/0048_auto_20190122_1621.py b/archaeological_operations/migrations/0048_auto_20190122_1621.py deleted file mode 100644 index c7d2d8cb1..000000000 --- a/archaeological_operations/migrations/0048_auto_20190122_1621.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-01-22 16:21 -from __future__ import unicode_literals - -import django.contrib.gis.db.models.fields -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_operations', '0047_point_to_point_2d'), - ] - - operations = [ - migrations.AlterField( - model_name='archaeologicalsite', - name='point', - field=django.contrib.gis.db.models.fields.PointField(blank=True, dim=3, null=True, srid=4326, verbose_name='Point'), - ), - migrations.AlterField( - model_name='historicalarchaeologicalsite', - name='point', - field=django.contrib.gis.db.models.fields.PointField(blank=True, dim=3, null=True, srid=4326, verbose_name='Point'), - ), - migrations.AlterField( - model_name='historicaloperation', - name='point', - field=django.contrib.gis.db.models.fields.PointField(blank=True, dim=3, null=True, srid=4326, verbose_name='Point'), - ), - migrations.AlterField( - model_name='operation', - name='point', - field=django.contrib.gis.db.models.fields.PointField(blank=True, dim=3, null=True, srid=4326, verbose_name='Point'), - ), - ] diff --git a/archaeological_operations/migrations/0048_point_to_point_2d.py b/archaeological_operations/migrations/0048_point_to_point_2d.py new file mode 100644 index 000000000..9b590ff7b --- /dev/null +++ b/archaeological_operations/migrations/0048_point_to_point_2d.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-01-22 15:54 +from __future__ import unicode_literals + +from django.db import migrations + + +def point_to_point_2d(apps, schema_editor): + ArchaeologicalSite = apps.get_model( + 'archaeological_operations', 'ArchaeologicalSite') + Operation = apps.get_model('archaeological_operations', 'Operation') + for kls in [ArchaeologicalSite, Operation]: + for item in kls.objects.exclude(point__isnull=True).all(): + item.point_2d = item.point + item.point = None + item.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_operations', '0047_auto_20190122_1550'), + ] + + operations = [ + migrations.RunPython(point_to_point_2d) + ] diff --git a/archaeological_operations/migrations/0049_auto_20190122_1621.py b/archaeological_operations/migrations/0049_auto_20190122_1621.py new file mode 100644 index 000000000..16dbb507f --- /dev/null +++ b/archaeological_operations/migrations/0049_auto_20190122_1621.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-01-22 16:21 +from __future__ import unicode_literals + +import django.contrib.gis.db.models.fields +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_operations', '0048_point_to_point_2d'), + ] + + operations = [ + migrations.AlterField( + model_name='archaeologicalsite', + name='point', + field=django.contrib.gis.db.models.fields.PointField(blank=True, dim=3, null=True, srid=4326, verbose_name='Point'), + ), + migrations.AlterField( + model_name='historicalarchaeologicalsite', + name='point', + field=django.contrib.gis.db.models.fields.PointField(blank=True, dim=3, null=True, srid=4326, verbose_name='Point'), + ), + migrations.AlterField( + model_name='historicaloperation', + name='point', + field=django.contrib.gis.db.models.fields.PointField(blank=True, dim=3, null=True, srid=4326, verbose_name='Point'), + ), + migrations.AlterField( + model_name='operation', + name='point', + field=django.contrib.gis.db.models.fields.PointField(blank=True, dim=3, null=True, srid=4326, verbose_name='Point'), + ), + ] -- cgit v1.2.3