From 221aab7f748f6e975abc14495f02bf86162b09b6 Mon Sep 17 00:00:00 2001
From: "alexander.pace@ligo.org" <alexander.pace@ligo.org>
Date: Tue, 12 Nov 2019 14:29:13 -0600
Subject: [PATCH] Finally cleaning up migrations
Squashing errors in the gitlab pipeline.
---
.../0005_add_coinc_far_and_em_type.py | 26 ---------
.../0006_add_coinc_far_and_em_type.py | 26 ---------
...t_fields.py => 0006_auto_20191112_2004.py} | 37 +++++++-----
.../0007_add_raven_voevent_fields.py | 56 -------------------
4 files changed, 24 insertions(+), 121 deletions(-)
delete mode 100644 gracedb/superevents/migrations/0005_add_coinc_far_and_em_type.py
delete mode 100644 gracedb/superevents/migrations/0006_add_coinc_far_and_em_type.py
rename gracedb/superevents/migrations/{0006_add_raven_voevent_fields.py => 0006_auto_20191112_2004.py} (58%)
delete mode 100644 gracedb/superevents/migrations/0007_add_raven_voevent_fields.py
diff --git a/gracedb/superevents/migrations/0005_add_coinc_far_and_em_type.py b/gracedb/superevents/migrations/0005_add_coinc_far_and_em_type.py
deleted file mode 100644
index 744636056..000000000
--- a/gracedb/superevents/migrations/0005_add_coinc_far_and_em_type.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-15 18:07
-from __future__ import unicode_literals
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('superevents', '0004_populate_voevent_fields'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='Superevent',
- name='coinc_far',
- field=models.FloatField(blank=True, null=True),
- ),
- migrations.AddField(
- model_name='Superevent',
- name='em_type',
- field=models.CharField(null=True, blank=True, max_length=100),
- ),
- ]
diff --git a/gracedb/superevents/migrations/0006_add_coinc_far_and_em_type.py b/gracedb/superevents/migrations/0006_add_coinc_far_and_em_type.py
deleted file mode 100644
index 90a73790a..000000000
--- a/gracedb/superevents/migrations/0006_add_coinc_far_and_em_type.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-15 18:07
-from __future__ import unicode_literals
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('superevents', '0005_auto_20190919_1957'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='Superevent',
- name='coinc_far',
- field=models.FloatField(blank=True, null=True),
- ),
- migrations.AddField(
- model_name='Superevent',
- name='em_type',
- field=models.CharField(null=True, blank=True, max_length=100),
- ),
- ]
diff --git a/gracedb/superevents/migrations/0006_add_raven_voevent_fields.py b/gracedb/superevents/migrations/0006_auto_20191112_2004.py
similarity index 58%
rename from gracedb/superevents/migrations/0006_add_raven_voevent_fields.py
rename to gracedb/superevents/migrations/0006_auto_20191112_2004.py
index 7efed677d..02bcd1e69 100644
--- a/gracedb/superevents/migrations/0006_add_raven_voevent_fields.py
+++ b/gracedb/superevents/migrations/0006_auto_20191112_2004.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-15 18:07
+# Generated by Django 1.11.23 on 2019-11-12 20:04
from __future__ import unicode_literals
import django.core.validators
@@ -9,48 +9,59 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('superevents', '0005_add_coinc_far_and_em_type'),
+ ('superevents', '0005_auto_20190919_1957'),
]
operations = [
migrations.AddField(
- model_name='voevent',
- name='raven_coinc',
- field=models.BooleanField(default=False),
+ model_name='superevent',
+ name='coinc_far',
+ field=models.FloatField(blank=True, null=True),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='superevent',
+ name='em_type',
+ field=models.CharField(blank=True, max_length=100, null=True),
),
migrations.AddField(
model_name='voevent',
name='combined_skymap_filename',
field=models.CharField(blank=True, default=None, max_length=100, null=True),
),
+ migrations.AddField(
+ model_name='voevent',
+ name='delta_t',
+ field=models.FloatField(blank=True, default=None, null=True, validators=[django.core.validators.MinValueValidator(-1000), django.core.validators.MaxValueValidator(1000)]),
+ ),
migrations.AddField(
model_name='voevent',
name='ext_gcn',
- field=models.CharField(blank=True, default=None, max_length=100, null=True),
+ field=models.CharField(blank=True, default='', editable=False, max_length=100),
),
migrations.AddField(
model_name='voevent',
name='ext_pipeline',
- field=models.CharField(blank=True, default=None, max_length=100, null=True),
+ field=models.CharField(blank=True, default='', editable=False, max_length=100),
),
migrations.AddField(
model_name='voevent',
name='ext_search',
- field=models.CharField(blank=True, default=None, max_length=100, null=True),
+ field=models.CharField(blank=True, default='', editable=False, max_length=100),
),
migrations.AddField(
model_name='voevent',
- name='time_coinc_far',
- field=models.FloatField(blank=True, default=None, null=True),
+ name='raven_coinc',
+ field=models.BooleanField(default=False),
),
migrations.AddField(
model_name='voevent',
name='space_coinc_far',
- field=models.FloatField(blank=True, default=None, null=True),
+ field=models.FloatField(blank=True, default=None, null=True, validators=[django.core.validators.MinValueValidator(0.0)]),
),
migrations.AddField(
model_name='voevent',
- name='delta_t',
- field=models.FloatField(blank=True, default=None, null=True),
+ name='time_coinc_far',
+ field=models.FloatField(blank=True, default=None, null=True, validators=[django.core.validators.MinValueValidator(0.0)]),
),
]
diff --git a/gracedb/superevents/migrations/0007_add_raven_voevent_fields.py b/gracedb/superevents/migrations/0007_add_raven_voevent_fields.py
deleted file mode 100644
index 176f4f5cc..000000000
--- a/gracedb/superevents/migrations/0007_add_raven_voevent_fields.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-15 18:07
-from __future__ import unicode_literals
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('superevents', '0006_add_coinc_far_and_em_type'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='voevent',
- name='raven_coinc',
- field=models.BooleanField(default=False),
- ),
- migrations.AddField(
- model_name='voevent',
- name='combined_skymap_filename',
- field=models.CharField(blank=True, default=None, max_length=100, null=True),
- ),
- migrations.AddField(
- model_name='voevent',
- name='ext_gcn',
- field=models.CharField(blank=True, default=None, max_length=100, null=True),
- ),
- migrations.AddField(
- model_name='voevent',
- name='ext_pipeline',
- field=models.CharField(blank=True, default=None, max_length=100, null=True),
- ),
- migrations.AddField(
- model_name='voevent',
- name='ext_search',
- field=models.CharField(blank=True, default=None, max_length=100, null=True),
- ),
- migrations.AddField(
- model_name='voevent',
- name='time_coinc_far',
- field=models.FloatField(blank=True, default=None, null=True),
- ),
- migrations.AddField(
- model_name='voevent',
- name='space_coinc_far',
- field=models.FloatField(blank=True, default=None, null=True),
- ),
- migrations.AddField(
- model_name='voevent',
- name='delta_t',
- field=models.FloatField(blank=True, default=None, null=True),
- ),
- ]
--
GitLab