From 647cf2ac76d4fb4237a7cb88792841071a40ed38 Mon Sep 17 00:00:00 2001 From: Nico Vermaas <vermaas@astron.nl> Date: Tue, 2 Feb 2021 09:26:18 +0100 Subject: [PATCH] reset migrations (blew up database... again) --- atdb/taskdatabase/migrations/0001_initial.py | 75 ------------------- .../migrations/0002_auto_20210129_0739.py | 22 ------ .../migrations/0003_remove_task_taskid.py | 17 ----- atdb/taskdatabase/migrations/__init__.py | 0 .../templates/taskdatabase/index.html | 2 +- 5 files changed, 1 insertion(+), 115 deletions(-) delete mode 100644 atdb/taskdatabase/migrations/0001_initial.py delete mode 100644 atdb/taskdatabase/migrations/0002_auto_20210129_0739.py delete mode 100644 atdb/taskdatabase/migrations/0003_remove_task_taskid.py delete mode 100644 atdb/taskdatabase/migrations/__init__.py diff --git a/atdb/taskdatabase/migrations/0001_initial.py b/atdb/taskdatabase/migrations/0001_initial.py deleted file mode 100644 index ab856c54..00000000 --- a/atdb/taskdatabase/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.1.4 on 2021-01-28 13:10 - -import datetime -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Workflow', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('workflow_uri', models.CharField(blank=True, max_length=30, null=True, unique=True)), - ('repository', models.CharField(blank=True, max_length=100, null=True)), - ('commit_id', models.CharField(blank=True, max_length=15, null=True)), - ('path', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='Task', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('taskID', models.CharField(blank=True, db_index=True, max_length=30, null=True)), - ('task_type', models.CharField(default='task', max_length=20)), - ('filter', models.CharField(blank=True, max_length=30, null=True)), - ('new_status', models.CharField(default='defining', max_length=50, null=True)), - ('status', models.CharField(blank=True, db_index=True, default='unknown', max_length=50, null=True)), - ('new_workflow_id', models.CharField(blank=True, max_length=15, null=True)), - ('new_workflow_uri', models.CharField(blank=True, max_length=100, null=True)), - ('resume', models.BooleanField(default=True)), - ('creationTime', models.DateTimeField(blank=True, default=datetime.datetime.utcnow)), - ('priority', models.IntegerField(null=True)), - ('purge_policy', models.CharField(blank=True, default='no', max_length=5, null=True)), - ('stage_request_id', models.IntegerField(null=True)), - ('project', models.CharField(blank=True, default='unknown', max_length=100, null=True)), - ('sas_id', models.CharField(blank=True, max_length=15, null=True)), - ('inputs', models.JSONField(blank=True, null=True)), - ('outputs', models.JSONField(blank=True, null=True)), - ('metrics', models.JSONField(blank=True, null=True)), - ('predecessor', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='successors', to='taskdatabase.task')), - ('workflow', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='tasks', to='taskdatabase.workflow')), - ], - ), - migrations.CreateModel( - name='Status', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(default='unknown', max_length=50)), - ('timestamp', models.DateTimeField(blank=True, default=datetime.datetime.utcnow)), - ('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='status_history', to='taskdatabase.task')), - ], - ), - migrations.CreateModel( - name='LogEntry', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('cpu_cycles', models.IntegerField(blank=True, null=True)), - ('wall_clock_time', models.IntegerField(blank=True, null=True)), - ('url_to_log_file', models.CharField(blank=True, max_length=100, null=True)), - ('step_name', models.CharField(blank=True, max_length=30, null=True)), - ('start_time', models.DateTimeField(blank=True, null=True)), - ('end_time', models.DateTimeField(blank=True, null=True)), - ('status', models.CharField(blank=True, default='defined', max_length=50, null=True)), - ('description', models.CharField(blank=True, max_length=100, null=True)), - ('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='log_entries', to='taskdatabase.task')), - ], - ), - ] diff --git a/atdb/taskdatabase/migrations/0002_auto_20210129_0739.py b/atdb/taskdatabase/migrations/0002_auto_20210129_0739.py deleted file mode 100644 index 0d187f8b..00000000 --- a/atdb/taskdatabase/migrations/0002_auto_20210129_0739.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.1.4 on 2021-01-29 06:39 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('taskdatabase', '0001_initial'), - ] - - operations = [ - migrations.RenameField( - model_name='logentry', - old_name='end_time', - new_name='timestamp', - ), - migrations.RemoveField( - model_name='logentry', - name='start_time', - ), - ] diff --git a/atdb/taskdatabase/migrations/0003_remove_task_taskid.py b/atdb/taskdatabase/migrations/0003_remove_task_taskid.py deleted file mode 100644 index 9de008f2..00000000 --- a/atdb/taskdatabase/migrations/0003_remove_task_taskid.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.1.4 on 2021-01-29 07:31 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('taskdatabase', '0002_auto_20210129_0739'), - ] - - operations = [ - migrations.RemoveField( - model_name='task', - name='taskID', - ), - ] diff --git a/atdb/taskdatabase/migrations/__init__.py b/atdb/taskdatabase/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 44627b0f..12d5f0ef 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -44,7 +44,7 @@ </div> {% include 'taskdatabase/pagination.html' %} </div> - <p class="footer"> Version 1.0.0 (2 feb 2021 - 7:00) + <p class="footer"> Version 1.0.0 (2 feb 2021 - 9:00) <script type="text/javascript"> (function(seconds) { var refresh, -- GitLab