From 0aec3175ac27eaa3c31642bde6e778bfca99570a Mon Sep 17 00:00:00 2001 From: Maarten Pronk Date: Fri, 5 Jul 2024 15:30:04 +0200 Subject: [PATCH] Update the migrations. --- delft3dgtmain/settings.py | 2 +- delft3dworker/migrations/0001_initial.py | 156 ++++++++++++++++-- delft3dworker/migrations/0002_modelruns.py | 33 ---- .../migrations/0003_auto_20160128_0349.py | 21 --- .../migrations/0004_auto_20160201_1516.py | 18 -- .../migrations/0005_delft3dworker_json.py | 20 --- .../migrations/0006_auto_20160202_1341.py | 25 --- .../migrations/0007_delft3dworker_workerid.py | 20 --- .../migrations/0008_delft3dworker_info.py | 20 --- .../migrations/0009_auto_20160205_1206.py | 28 ---- ...ask_processingtask_scene_simulationtask.py | 121 -------------- .../migrations/0011_auto_20160317_1116.py | 27 --- .../migrations/0012_auto_20160317_1423.py | 19 --- .../migrations/0013_delete_delft3dworker.py | 16 -- delft3dworker/migrations/0014_scenario.py | 28 ---- .../migrations/0014_scene_task_id.py | 21 --- delft3dworker/migrations/0015_template.py | 30 ---- .../migrations/0016_auto_20160318_1719.py | 54 ------ .../migrations/0017_template_groups.py | 19 --- delft3dworker/migrations/0018_merge.py | 13 -- .../migrations/0019_auto_20160421_1319.py | 43 ----- .../migrations/0020_auto_20160422_2304.py | 49 ------ .../migrations/0021_auto_20160525_1826.py | 24 --- .../migrations/0022_auto_20160525_1906.py | 18 -- .../migrations/0023_auto_20160531_0851.py | 57 ------- .../migrations/0024_auto_20160602_0715.py | 20 --- .../migrations/0025_auto_20160602_0955.py | 23 --- .../migrations/0025_auto_20160602_1100.py | 29 ---- .../migrations/0026_auto_20160602_1334.py | 23 --- delft3dworker/migrations/0026_merge.py | 13 -- .../migrations/0027_auto_20160602_1435.py | 23 --- delft3dworker/migrations/0027_merge.py | 13 -- .../migrations/0028_auto_20160602_1433.py | 23 --- .../migrations/0029_auto_20160531_0908.py | 34 ---- delft3dworker/migrations/0029_merge.py | 13 -- .../migrations/0030_auto_20160531_0922.py | 21 --- .../migrations/0031_auto_20160531_0923.py | 17 -- delft3dworker/migrations/0032_merge.py | 13 -- delft3dworker/migrations/0033_merge.py | 13 -- delft3dworker/migrations/0034_scene_shared.py | 23 --- .../migrations/0035_auto_20160527_1326.py | 27 --- .../migrations/0036_auto_20160527_1445.py | 18 -- .../migrations/0037_auto_20160608_2304.py | 18 -- delft3dworker/migrations/0038_searchform.py | 30 ---- .../migrations/0039_auto_20160706_1418.py | 19 --- .../migrations/0040_searchform_templates.py | 19 --- .../migrations/0041_auto_20160708_0918.py | 18 -- .../migrations/0042_remove_scene_suid.py | 17 -- delft3dworker/migrations/0043_scene_suid.py | 20 --- .../migrations/0044_auto_20160713_1222.py | 28 ---- .../migrations/0045_auto_20160714_0811.py | 23 --- .../migrations/0046_auto_20160715_1022.py | 18 -- delft3dworker/migrations/0047_container.py | 68 -------- .../migrations/0048_container_scene.py | 21 --- .../migrations/0049_auto_20160825_0932.py | 47 ------ .../migrations/0050_auto_20160825_0934.py | 18 -- .../migrations/0051_auto_20160825_0935.py | 18 -- .../migrations/0052_auto_20160825_1404.py | 56 ------- .../migrations/0053_auto_20160826_0747.py | 20 --- .../migrations/0054_auto_20160826_0747.py | 20 --- .../migrations/0055_container_docker_log.py | 18 -- .../migrations/0056_auto_20160825_0548.py | 25 --- .../migrations/0057_auto_20160829_1429.py | 28 ---- .../0058_container_task_starttime.py | 25 --- delft3dworker/migrations/0058_scene_phase.py | 30 ---- .../migrations/0059_auto_20160830_1042.py | 45 ----- .../migrations/0059_auto_20160830_1304.py | 19 --- delft3dworker/migrations/0059_merge.py | 13 -- .../migrations/0060_auto_20160830_1258.py | 53 ------ delft3dworker/migrations/0060_merge.py | 13 -- .../migrations/0061_auto_20160830_1300.py | 25 --- .../migrations/0061_auto_20160830_1329.py | 29 ---- .../migrations/0062_auto_20160830_1300.py | 25 --- .../migrations/0063_auto_20160830_1301.py | 19 --- delft3dworker/migrations/0064_merge.py | 13 -- .../migrations/0065_auto_20160831_1441.py | 41 ----- delft3dworker/migrations/0065_merge.py | 13 -- .../migrations/0066_auto_20160831_1311.py | 41 ----- .../0067_container_container_exitcode.py | 18 -- .../0068_container_container_progress.py | 18 -- delft3dworker/migrations/0069_merge.py | 13 -- .../migrations/0070_auto_20160901_0755.py | 45 ----- .../migrations/0071_auto_20160830_2301.py | 46 ------ .../migrations/0072_auto_20160830_2334.py | 47 ------ .../migrations/0073_auto_20160907_1301.py | 29 ---- .../migrations/0074_auto_20160907_1315.py | 50 ------ .../migrations/0075_auto_20161012_1147.py | 50 ------ .../migrations/0076_auto_20161012_1241.py | 53 ------ .../migrations/0077_auto_20161018_0925.py | 58 ------- .../migrations/0078_auto_20161116_0958.py | 24 --- .../migrations/0079_auto_20161118_1341.py | 32 ---- .../migrations/0080_auto_20161121_1302.py | 31 ---- .../migrations/0081_auto_20161122_1241.py | 23 --- .../migrations/0082_auto_20161122_1530.py | 54 ------ .../migrations/0083_auto_20170412_0907.py | 91 ---------- .../migrations/0084_auto_20170419_1510.py | 62 ------- .../0084_migrate_scene_finished_state.py | 17 -- delft3dworker/migrations/0085_merge.py | 13 -- .../migrations/0086_auto_20170425_0852.py | 21 --- .../migrations/0087_auto_20180214_1324.py | 130 --------------- .../migrations/0088_auto_20180529_0942.py | 151 ----------------- .../migrations/0089_template_shortname.py | 19 --- .../migrations/0090_auto_20180530_0832.py | 55 ------ .../migrations/0091_auto_20180530_1505.py | 21 --- .../migrations/0092_auto_20180530_1506.py | 21 --- .../migrations/0093_auto_20181112_1250.py | 50 ------ .../migrations/0094_auto_20181204_1539.py | 82 --------- .../migrations/0095_auto_20181204_1559.py | 23 --- .../migrations/0096_auto_20181206_1234.py | 23 --- .../migrations/0097_auto_20190211_1126.py | 79 --------- .../migrations/0098_auto_20200226_1452.py | 24 --- .../migrations/0099_alter_scene_phase.py | 31 ---- .../migrations/0100_alter_scene_options.py | 18 -- .../migrations/0101_add_restricted_group.py | 47 ------ .../0102_add_extended_view_permissions.py | 72 -------- .../0103_alter_template_yaml_template.py | 17 -- .../0104_manual_scene_images_fix.py | 53 ------ requirements.txt | 1 - worker_requirements.txt | 2 +- 119 files changed, 143 insertions(+), 3752 deletions(-) delete mode 100644 delft3dworker/migrations/0002_modelruns.py delete mode 100644 delft3dworker/migrations/0003_auto_20160128_0349.py delete mode 100644 delft3dworker/migrations/0004_auto_20160201_1516.py delete mode 100644 delft3dworker/migrations/0005_delft3dworker_json.py delete mode 100644 delft3dworker/migrations/0006_auto_20160202_1341.py delete mode 100644 delft3dworker/migrations/0007_delft3dworker_workerid.py delete mode 100644 delft3dworker/migrations/0008_delft3dworker_info.py delete mode 100644 delft3dworker/migrations/0009_auto_20160205_1206.py delete mode 100644 delft3dworker/migrations/0010_celerytask_postprocessingtask_processingtask_scene_simulationtask.py delete mode 100644 delft3dworker/migrations/0011_auto_20160317_1116.py delete mode 100644 delft3dworker/migrations/0012_auto_20160317_1423.py delete mode 100644 delft3dworker/migrations/0013_delete_delft3dworker.py delete mode 100644 delft3dworker/migrations/0014_scenario.py delete mode 100644 delft3dworker/migrations/0014_scene_task_id.py delete mode 100644 delft3dworker/migrations/0015_template.py delete mode 100644 delft3dworker/migrations/0016_auto_20160318_1719.py delete mode 100644 delft3dworker/migrations/0017_template_groups.py delete mode 100644 delft3dworker/migrations/0018_merge.py delete mode 100644 delft3dworker/migrations/0019_auto_20160421_1319.py delete mode 100644 delft3dworker/migrations/0020_auto_20160422_2304.py delete mode 100644 delft3dworker/migrations/0021_auto_20160525_1826.py delete mode 100644 delft3dworker/migrations/0022_auto_20160525_1906.py delete mode 100644 delft3dworker/migrations/0023_auto_20160531_0851.py delete mode 100644 delft3dworker/migrations/0024_auto_20160602_0715.py delete mode 100644 delft3dworker/migrations/0025_auto_20160602_0955.py delete mode 100644 delft3dworker/migrations/0025_auto_20160602_1100.py delete mode 100644 delft3dworker/migrations/0026_auto_20160602_1334.py delete mode 100644 delft3dworker/migrations/0026_merge.py delete mode 100644 delft3dworker/migrations/0027_auto_20160602_1435.py delete mode 100644 delft3dworker/migrations/0027_merge.py delete mode 100644 delft3dworker/migrations/0028_auto_20160602_1433.py delete mode 100644 delft3dworker/migrations/0029_auto_20160531_0908.py delete mode 100644 delft3dworker/migrations/0029_merge.py delete mode 100644 delft3dworker/migrations/0030_auto_20160531_0922.py delete mode 100644 delft3dworker/migrations/0031_auto_20160531_0923.py delete mode 100644 delft3dworker/migrations/0032_merge.py delete mode 100644 delft3dworker/migrations/0033_merge.py delete mode 100644 delft3dworker/migrations/0034_scene_shared.py delete mode 100644 delft3dworker/migrations/0035_auto_20160527_1326.py delete mode 100644 delft3dworker/migrations/0036_auto_20160527_1445.py delete mode 100644 delft3dworker/migrations/0037_auto_20160608_2304.py delete mode 100644 delft3dworker/migrations/0038_searchform.py delete mode 100644 delft3dworker/migrations/0039_auto_20160706_1418.py delete mode 100644 delft3dworker/migrations/0040_searchform_templates.py delete mode 100644 delft3dworker/migrations/0041_auto_20160708_0918.py delete mode 100644 delft3dworker/migrations/0042_remove_scene_suid.py delete mode 100644 delft3dworker/migrations/0043_scene_suid.py delete mode 100644 delft3dworker/migrations/0044_auto_20160713_1222.py delete mode 100644 delft3dworker/migrations/0045_auto_20160714_0811.py delete mode 100644 delft3dworker/migrations/0046_auto_20160715_1022.py delete mode 100644 delft3dworker/migrations/0047_container.py delete mode 100644 delft3dworker/migrations/0048_container_scene.py delete mode 100644 delft3dworker/migrations/0049_auto_20160825_0932.py delete mode 100644 delft3dworker/migrations/0050_auto_20160825_0934.py delete mode 100644 delft3dworker/migrations/0051_auto_20160825_0935.py delete mode 100644 delft3dworker/migrations/0052_auto_20160825_1404.py delete mode 100644 delft3dworker/migrations/0053_auto_20160826_0747.py delete mode 100644 delft3dworker/migrations/0054_auto_20160826_0747.py delete mode 100644 delft3dworker/migrations/0055_container_docker_log.py delete mode 100644 delft3dworker/migrations/0056_auto_20160825_0548.py delete mode 100644 delft3dworker/migrations/0057_auto_20160829_1429.py delete mode 100644 delft3dworker/migrations/0058_container_task_starttime.py delete mode 100644 delft3dworker/migrations/0058_scene_phase.py delete mode 100644 delft3dworker/migrations/0059_auto_20160830_1042.py delete mode 100644 delft3dworker/migrations/0059_auto_20160830_1304.py delete mode 100644 delft3dworker/migrations/0059_merge.py delete mode 100644 delft3dworker/migrations/0060_auto_20160830_1258.py delete mode 100644 delft3dworker/migrations/0060_merge.py delete mode 100644 delft3dworker/migrations/0061_auto_20160830_1300.py delete mode 100644 delft3dworker/migrations/0061_auto_20160830_1329.py delete mode 100644 delft3dworker/migrations/0062_auto_20160830_1300.py delete mode 100644 delft3dworker/migrations/0063_auto_20160830_1301.py delete mode 100644 delft3dworker/migrations/0064_merge.py delete mode 100644 delft3dworker/migrations/0065_auto_20160831_1441.py delete mode 100644 delft3dworker/migrations/0065_merge.py delete mode 100644 delft3dworker/migrations/0066_auto_20160831_1311.py delete mode 100644 delft3dworker/migrations/0067_container_container_exitcode.py delete mode 100644 delft3dworker/migrations/0068_container_container_progress.py delete mode 100644 delft3dworker/migrations/0069_merge.py delete mode 100644 delft3dworker/migrations/0070_auto_20160901_0755.py delete mode 100644 delft3dworker/migrations/0071_auto_20160830_2301.py delete mode 100644 delft3dworker/migrations/0072_auto_20160830_2334.py delete mode 100644 delft3dworker/migrations/0073_auto_20160907_1301.py delete mode 100644 delft3dworker/migrations/0074_auto_20160907_1315.py delete mode 100644 delft3dworker/migrations/0075_auto_20161012_1147.py delete mode 100644 delft3dworker/migrations/0076_auto_20161012_1241.py delete mode 100644 delft3dworker/migrations/0077_auto_20161018_0925.py delete mode 100644 delft3dworker/migrations/0078_auto_20161116_0958.py delete mode 100644 delft3dworker/migrations/0079_auto_20161118_1341.py delete mode 100644 delft3dworker/migrations/0080_auto_20161121_1302.py delete mode 100644 delft3dworker/migrations/0081_auto_20161122_1241.py delete mode 100644 delft3dworker/migrations/0082_auto_20161122_1530.py delete mode 100644 delft3dworker/migrations/0083_auto_20170412_0907.py delete mode 100644 delft3dworker/migrations/0084_auto_20170419_1510.py delete mode 100644 delft3dworker/migrations/0084_migrate_scene_finished_state.py delete mode 100644 delft3dworker/migrations/0085_merge.py delete mode 100644 delft3dworker/migrations/0086_auto_20170425_0852.py delete mode 100644 delft3dworker/migrations/0087_auto_20180214_1324.py delete mode 100644 delft3dworker/migrations/0088_auto_20180529_0942.py delete mode 100644 delft3dworker/migrations/0089_template_shortname.py delete mode 100644 delft3dworker/migrations/0090_auto_20180530_0832.py delete mode 100644 delft3dworker/migrations/0091_auto_20180530_1505.py delete mode 100644 delft3dworker/migrations/0092_auto_20180530_1506.py delete mode 100644 delft3dworker/migrations/0093_auto_20181112_1250.py delete mode 100644 delft3dworker/migrations/0094_auto_20181204_1539.py delete mode 100644 delft3dworker/migrations/0095_auto_20181204_1559.py delete mode 100644 delft3dworker/migrations/0096_auto_20181206_1234.py delete mode 100644 delft3dworker/migrations/0097_auto_20190211_1126.py delete mode 100644 delft3dworker/migrations/0098_auto_20200226_1452.py delete mode 100644 delft3dworker/migrations/0099_alter_scene_phase.py delete mode 100644 delft3dworker/migrations/0100_alter_scene_options.py delete mode 100644 delft3dworker/migrations/0101_add_restricted_group.py delete mode 100644 delft3dworker/migrations/0102_add_extended_view_permissions.py delete mode 100644 delft3dworker/migrations/0103_alter_template_yaml_template.py delete mode 100644 delft3dworker/migrations/0104_manual_scene_images_fix.py diff --git a/delft3dgtmain/settings.py b/delft3dgtmain/settings.py index 5c0bf2d..3b3a00e 100644 --- a/delft3dgtmain/settings.py +++ b/delft3dgtmain/settings.py @@ -229,7 +229,7 @@ DATABASES = { "default": { - "ENGINE": "django.db.backends.postgresql_psycopg2", + "ENGINE": "django.db.backends.postgresql", "NAME": "djangodb_test", "USER": "postgres", "PASSWORD": "postgres", diff --git a/delft3dworker/migrations/0001_initial.py b/delft3dworker/migrations/0001_initial.py index 8c6ecea..f745e51 100644 --- a/delft3dworker/migrations/0001_initial.py +++ b/delft3dworker/migrations/0001_initial.py @@ -1,29 +1,155 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-01-28 09:22 -from __future__ import unicode_literals +# Generated by Django 3.2.25 on 2024-07-05 13:14 +import delft3dworker.models +import delft3dworker.utils +from django.conf import settings +import django.contrib.auth.models from django.db import migrations, models +import django.db.models.deletion +import uuid class Migration(migrations.Migration): + initial = True - dependencies = [] + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('auth', '0012_alter_user_first_name_max_length'), + ] operations = [ migrations.CreateModel( - name="WorkerTask", + name='Scenario', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("name", models.CharField(max_length=256)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=256)), + ('scenes_parameters', delft3dworker.models.JSONFieldTransition(blank=True, default=dict)), + ('parameters', delft3dworker.models.JSONFieldTransition(blank=True, default=dict)), + ('state', models.CharField(default='CREATED', max_length=64)), + ('progress', models.IntegerField(default=0)), + ('owner', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), + migrations.CreateModel( + name='Scene', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=256)), + ('suid', models.UUIDField(default=uuid.uuid4, editable=False)), + ('date_created', models.DateTimeField(blank=True, default=delft3dworker.utils.tz_now)), + ('date_started', models.DateTimeField(blank=True, null=True)), + ('fileurl', models.CharField(max_length=256)), + ('info', delft3dworker.models.JSONFieldTransition(blank=True, default=dict)), + ('parameters', delft3dworker.models.JSONFieldTransition(blank=True, default=dict)), + ('state', models.CharField(default='CREATED', max_length=256)), + ('progress', models.IntegerField(default=0)), + ('task_id', models.CharField(blank=True, max_length=256)), + ('workingdir', models.CharField(max_length=256)), + ('parameters_hash', models.CharField(blank=True, max_length=64)), + ('shared', models.CharField(choices=[('p', 'private'), ('c', 'company'), ('w', 'world')], max_length=1)), + ('phase', models.PositiveSmallIntegerField(choices=[(0, 'New'), (6, 'Idle: waiting for user input'), (11, 'Starting workflow'), (12, 'Running workflow'), (13, 'Removing workflow'), (20, 'Stopping workflow'), (21, 'Removing stopped workflow'), (500, 'Finished'), (501, 'Failed'), (502, 'Stopped')], default=0)), + ('owner', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('scenario', models.ManyToManyField(blank=True, to='delft3dworker.Scenario')), + ], + options={ + 'permissions': [('extended_view_scene', 'Can view scene with actions.')], + }, + ), + migrations.CreateModel( + name='SearchForm', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=256)), + ('templates', delft3dworker.models.JSONFieldTransition(default=list)), + ('sections', delft3dworker.models.JSONFieldTransition(default=list)), + ], + ), + migrations.CreateModel( + name='Template', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=256)), + ('shortname', models.CharField(default=dict, max_length=256)), + ('meta', delft3dworker.models.JSONFieldTransition(blank=True, default=dict)), + ('info', delft3dworker.models.JSONFieldTransition(blank=True, default=dict)), + ('sections', delft3dworker.models.JSONFieldTransition(blank=True, default=dict)), + ('visualisation', delft3dworker.models.JSONFieldTransition(blank=True, default=dict)), + ('export_options', delft3dworker.models.JSONFieldTransition(blank=True, default=dict)), + ('yaml_template', models.FileField(default='', upload_to=delft3dworker.models.parse_argo_workflow)), + ], + ), + migrations.CreateModel( + name='Version_Docker', + fields=[ + ('release', models.CharField(db_index=True, max_length=256)), + ('revision', models.AutoField(primary_key=True, serialize=False)), + ('versions', delft3dworker.models.JSONFieldTransition(default=dict)), + ('changelog', models.CharField(max_length=256)), + ('reviewed', models.BooleanField(default=False)), + ('template', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='versions', to='delft3dworker.template')), + ], + options={ + 'verbose_name': 'Docker version', + 'verbose_name_plural': 'Docker versions', + 'ordering': ['-revision'], + }, + ), + migrations.CreateModel( + name='GroupUsageSummary', + fields=[ + ], + options={ + 'verbose_name': 'Group Usage Summary', + 'verbose_name_plural': 'Group Usage Summary', + 'proxy': True, + 'indexes': [], + 'constraints': [], + }, + bases=('auth.group',), + managers=[ + ('objects', django.contrib.auth.models.GroupManager()), + ], + ), + migrations.CreateModel( + name='UserUsageSummary', + fields=[ + ], + options={ + 'verbose_name': 'User Usage Summary', + 'verbose_name_plural': 'User Usage Summary', + 'proxy': True, + 'indexes': [], + 'constraints': [], + }, + bases=('auth.user',), + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + migrations.CreateModel( + name='Workflow', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=256, unique=True)), + ('entrypoint', models.CharField(max_length=64, null=True)), + ('starttime', models.DateTimeField(blank=True, default=delft3dworker.utils.tz_now)), + ('stoptime', models.DateTimeField(blank=True, null=True)), + ('yaml', models.FileField(default='', upload_to='workflows/')), + ('task_uuid', models.UUIDField(blank=True, default=None, null=True)), + ('task_starttime', models.DateTimeField(blank=True, default=delft3dworker.utils.tz_now)), + ('desired_state', models.CharField(choices=[('non-existent', 'Non-existent'), ('pending', 'Pending'), ('unknown', 'Unknown'), ('running', 'Running'), ('paused', 'Running (Suspended)'), ('succeeded', 'Succeeded'), ('skipped', 'Skipped'), ('failed', 'Failed'), ('error', 'Error')], default='non-existent', max_length=16)), + ('cluster_state', models.CharField(choices=[('non-existent', 'Non-existent'), ('pending', 'Pending'), ('unknown', 'Unknown'), ('running', 'Running'), ('paused', 'Running (Suspended)'), ('succeeded', 'Succeeded'), ('skipped', 'Skipped'), ('failed', 'Failed'), ('error', 'Error')], default='non-existent', max_length=16)), + ('progress', models.PositiveSmallIntegerField(default=0)), + ('cluster_log', models.TextField(blank=True, default='')), + ('action_log', models.TextField(blank=True, default='')), + ('scene', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='delft3dworker.scene')), + ('version', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='delft3dworker.version_docker')), + ], + ), + migrations.AddField( + model_name='scenario', + name='template', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='delft3dworker.template'), + ), ] diff --git a/delft3dworker/migrations/0002_modelruns.py b/delft3dworker/migrations/0002_modelruns.py deleted file mode 100644 index c34c488..0000000 --- a/delft3dworker/migrations/0002_modelruns.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-01-28 09:46 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0001_initial"), - ] - - operations = [ - migrations.CreateModel( - name="ModelRuns", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("name", models.CharField(max_length=256)), - ("uuid", models.CharField(max_length=256)), - ("status", models.CharField(max_length=256)), - ("progress", models.IntegerField()), - ("timeleft", models.IntegerField()), - ], - ), - ] diff --git a/delft3dworker/migrations/0003_auto_20160128_0349.py b/delft3dworker/migrations/0003_auto_20160128_0349.py deleted file mode 100644 index 48260ad..0000000 --- a/delft3dworker/migrations/0003_auto_20160128_0349.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-01-28 09:49 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0002_modelruns"), - ] - - operations = [ - migrations.RenameModel( - old_name="ModelRuns", - new_name="ModelRun", - ), - migrations.DeleteModel( - name="WorkerTask", - ), - ] diff --git a/delft3dworker/migrations/0004_auto_20160201_1516.py b/delft3dworker/migrations/0004_auto_20160201_1516.py deleted file mode 100644 index 4dbc605..0000000 --- a/delft3dworker/migrations/0004_auto_20160201_1516.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-02-01 15:16 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0003_auto_20160128_0349"), - ] - - operations = [ - migrations.RenameModel( - old_name="ModelRun", - new_name="Delft3DWorker", - ), - ] diff --git a/delft3dworker/migrations/0005_delft3dworker_json.py b/delft3dworker/migrations/0005_delft3dworker_json.py deleted file mode 100644 index 525a927..0000000 --- a/delft3dworker/migrations/0005_delft3dworker_json.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-02-01 15:30 -from __future__ import unicode_literals - -import jsonfield.fields -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0004_auto_20160201_1516"), - ] - - operations = [ - migrations.AddField( - model_name="delft3dworker", - name="json", - field=jsonfield.fields.JSONField(default=dict), - ), - ] diff --git a/delft3dworker/migrations/0006_auto_20160202_1341.py b/delft3dworker/migrations/0006_auto_20160202_1341.py deleted file mode 100644 index 7270506..0000000 --- a/delft3dworker/migrations/0006_auto_20160202_1341.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-02-02 13:41 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0005_delft3dworker_json"), - ] - - operations = [ - migrations.AddField( - model_name="delft3dworker", - name="workingdir", - field=models.CharField(default="", editable=False, max_length=256), - preserve_default=False, - ), - migrations.AlterField( - model_name="delft3dworker", - name="uuid", - field=models.CharField(editable=False, max_length=256), - ), - ] diff --git a/delft3dworker/migrations/0007_delft3dworker_workerid.py b/delft3dworker/migrations/0007_delft3dworker_workerid.py deleted file mode 100644 index 34cb90a..0000000 --- a/delft3dworker/migrations/0007_delft3dworker_workerid.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-02-03 13:30 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0006_auto_20160202_1341"), - ] - - operations = [ - migrations.AddField( - model_name="delft3dworker", - name="workerid", - field=models.CharField(default=0, editable=False, max_length=256), - preserve_default=False, - ), - ] diff --git a/delft3dworker/migrations/0008_delft3dworker_info.py b/delft3dworker/migrations/0008_delft3dworker_info.py deleted file mode 100644 index 24ce8da..0000000 --- a/delft3dworker/migrations/0008_delft3dworker_info.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-02-04 10:47 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0007_delft3dworker_workerid"), - ] - - operations = [ - migrations.AddField( - model_name="delft3dworker", - name="info", - field=models.CharField(default="", max_length=256), - preserve_default=False, - ), - ] diff --git a/delft3dworker/migrations/0009_auto_20160205_1206.py b/delft3dworker/migrations/0009_auto_20160205_1206.py deleted file mode 100644 index efa1c47..0000000 --- a/delft3dworker/migrations/0009_auto_20160205_1206.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-02-05 12:06 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0008_delft3dworker_info"), - ] - - operations = [ - migrations.RemoveField( - model_name="delft3dworker", - name="progress", - ), - migrations.RemoveField( - model_name="delft3dworker", - name="timeleft", - ), - migrations.AddField( - model_name="delft3dworker", - name="fileurl", - field=models.CharField(default="", editable=False, max_length=256), - preserve_default=False, - ), - ] diff --git a/delft3dworker/migrations/0010_celerytask_postprocessingtask_processingtask_scene_simulationtask.py b/delft3dworker/migrations/0010_celerytask_postprocessingtask_processingtask_scene_simulationtask.py deleted file mode 100644 index 3de9cc2..0000000 --- a/delft3dworker/migrations/0010_celerytask_postprocessingtask_processingtask_scene_simulationtask.py +++ /dev/null @@ -1,121 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import jsonfield.fields -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0009_auto_20160205_1206"), - ] - - operations = [ - migrations.CreateModel( - name="CeleryTask", - fields=[ - ( - "id", - models.AutoField( - verbose_name="ID", - serialize=False, - auto_created=True, - primary_key=True, - ), - ), - ("uuid", models.CharField(max_length=256)), - ("state", models.CharField(max_length=256, blank=True)), - ("state_meta", jsonfield.fields.JSONField(default=dict, blank=True)), - ], - ), - migrations.CreateModel( - name="Scene", - fields=[ - ( - "id", - models.AutoField( - verbose_name="ID", - serialize=False, - auto_created=True, - primary_key=True, - ), - ), - ("suid", models.CharField(max_length=256, editable=False)), - ("workingdir", models.CharField(max_length=256)), - ("fileurl", models.CharField(max_length=256)), - ("name", models.CharField(max_length=256)), - ("state", models.CharField(max_length=256, blank=True)), - ("info", models.CharField(max_length=256, blank=True)), - ("json", jsonfield.fields.JSONField(default=dict)), - ], - ), - migrations.CreateModel( - name="PostprocessingTask", - fields=[ - ( - "celerytask_ptr", - models.OneToOneField( - parent_link=True, - auto_created=True, - primary_key=True, - serialize=False, - to="delft3dworker.CeleryTask", - on_delete=models.CASCADE, - ), - ), - ( - "scene", - models.ForeignKey( - to="delft3dworker.Scene", on_delete=models.CASCADE - ), - ), - ], - bases=("delft3dworker.celerytask",), - ), - migrations.CreateModel( - name="ProcessingTask", - fields=[ - ( - "celerytask_ptr", - models.OneToOneField( - parent_link=True, - auto_created=True, - primary_key=True, - serialize=False, - to="delft3dworker.CeleryTask", - on_delete=models.CASCADE, - ), - ), - ( - "scene", - models.OneToOneField( - to="delft3dworker.Scene", on_delete=models.CASCADE - ), - ), - ], - bases=("delft3dworker.celerytask",), - ), - migrations.CreateModel( - name="SimulationTask", - fields=[ - ( - "celerytask_ptr", - models.OneToOneField( - parent_link=True, - auto_created=True, - primary_key=True, - serialize=False, - to="delft3dworker.CeleryTask", - on_delete=models.CASCADE, - ), - ), - ( - "scene", - models.OneToOneField( - to="delft3dworker.Scene", on_delete=models.CASCADE - ), - ), - ], - bases=("delft3dworker.celerytask",), - ), - ] diff --git a/delft3dworker/migrations/0011_auto_20160317_1116.py b/delft3dworker/migrations/0011_auto_20160317_1116.py deleted file mode 100644 index 5e1f872..0000000 --- a/delft3dworker/migrations/0011_auto_20160317_1116.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.4 on 2016-03-17 11:16 -from __future__ import unicode_literals - -import jsonfield.fields -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ( - "delft3dworker", - "0010_celerytask_postprocessingtask_processingtask_scene_simulationtask", - ), - ] - - operations = [ - migrations.RemoveField( - model_name="scene", - name="json", - ), - migrations.AlterField( - model_name="scene", - name="info", - field=jsonfield.fields.JSONField(default=dict), - ), - ] diff --git a/delft3dworker/migrations/0012_auto_20160317_1423.py b/delft3dworker/migrations/0012_auto_20160317_1423.py deleted file mode 100644 index ac1f694..0000000 --- a/delft3dworker/migrations/0012_auto_20160317_1423.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import jsonfield.fields -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0011_auto_20160317_1116"), - ] - - operations = [ - migrations.AlterField( - model_name="scene", - name="info", - field=jsonfield.fields.JSONField(default=dict, blank=True), - ), - ] diff --git a/delft3dworker/migrations/0013_delete_delft3dworker.py b/delft3dworker/migrations/0013_delete_delft3dworker.py deleted file mode 100644 index d266aad..0000000 --- a/delft3dworker/migrations/0013_delete_delft3dworker.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0012_auto_20160317_1423"), - ] - - operations = [ - migrations.DeleteModel( - name="Delft3DWorker", - ), - ] diff --git a/delft3dworker/migrations/0014_scenario.py b/delft3dworker/migrations/0014_scenario.py deleted file mode 100644 index e77fc2e..0000000 --- a/delft3dworker/migrations/0014_scenario.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0013_delete_delft3dworker"), - ] - - operations = [ - migrations.CreateModel( - name="Scenario", - fields=[ - ( - "id", - models.AutoField( - verbose_name="ID", - serialize=False, - auto_created=True, - primary_key=True, - ), - ), - ("name", models.CharField(max_length=256)), - ], - ), - ] diff --git a/delft3dworker/migrations/0014_scene_task_id.py b/delft3dworker/migrations/0014_scene_task_id.py deleted file mode 100644 index 16325a9..0000000 --- a/delft3dworker/migrations/0014_scene_task_id.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0013_delete_delft3dworker"), - ] - - operations = [ - migrations.AddField( - model_name="scene", - name="task_id", - field=models.CharField( - default="default value for backported scene", max_length=256 - ), - preserve_default=False, - ), - ] diff --git a/delft3dworker/migrations/0015_template.py b/delft3dworker/migrations/0015_template.py deleted file mode 100644 index ca340a4..0000000 --- a/delft3dworker/migrations/0015_template.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import jsonfield.fields -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0014_scenario"), - ] - - operations = [ - migrations.CreateModel( - name="Template", - fields=[ - ( - "id", - models.AutoField( - verbose_name="ID", - serialize=False, - auto_created=True, - primary_key=True, - ), - ), - ("name", models.CharField(max_length=256)), - ("json", jsonfield.fields.JSONField(default=dict, blank=True)), - ], - ), - ] diff --git a/delft3dworker/migrations/0016_auto_20160318_1719.py b/delft3dworker/migrations/0016_auto_20160318_1719.py deleted file mode 100644 index 9b63d94..0000000 --- a/delft3dworker/migrations/0016_auto_20160318_1719.py +++ /dev/null @@ -1,54 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0015_template"), - ] - - operations = [ - migrations.RenameField( - model_name="template", - old_name="name", - new_name="templatename", - ), - migrations.RenameField( - model_name="template", - old_name="json", - new_name="variables", - ), - migrations.AddField( - model_name="template", - name="description", - field=models.CharField(max_length=256, blank=True), - ), - migrations.AddField( - model_name="template", - name="email", - field=models.CharField(max_length=256, blank=True), - ), - migrations.AddField( - model_name="template", - name="label", - field=models.CharField(max_length=256, blank=True), - ), - migrations.AddField( - model_name="template", - name="model", - field=models.CharField(max_length=256, blank=True), - ), - migrations.AddField( - model_name="template", - name="site", - field=models.CharField(max_length=256, blank=True), - ), - migrations.AddField( - model_name="template", - name="version", - field=models.IntegerField(default=1, max_length=256, blank=True), - preserve_default=False, - ), - ] diff --git a/delft3dworker/migrations/0017_template_groups.py b/delft3dworker/migrations/0017_template_groups.py deleted file mode 100644 index d3a3670..0000000 --- a/delft3dworker/migrations/0017_template_groups.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import jsonfield.fields -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0016_auto_20160318_1719"), - ] - - operations = [ - migrations.AddField( - model_name="template", - name="groups", - field=jsonfield.fields.JSONField(default=dict, blank=True), - ), - ] diff --git a/delft3dworker/migrations/0018_merge.py b/delft3dworker/migrations/0018_merge.py deleted file mode 100644 index 9a01736..0000000 --- a/delft3dworker/migrations/0018_merge.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0017_template_groups"), - ("delft3dworker", "0014_scene_task_id"), - ] - - operations = [] diff --git a/delft3dworker/migrations/0019_auto_20160421_1319.py b/delft3dworker/migrations/0019_auto_20160421_1319.py deleted file mode 100644 index 93f0f81..0000000 --- a/delft3dworker/migrations/0019_auto_20160421_1319.py +++ /dev/null @@ -1,43 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import jsonfield.fields -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0018_merge"), - ] - - operations = [ - migrations.AddField( - model_name="scenario", - name="parameters", - field=jsonfield.fields.JSONField(default=dict, blank=True), - ), - migrations.AddField( - model_name="scenario", - name="template", - field=models.OneToOneField( - null=True, to="delft3dworker.Template", on_delete=models.CASCADE - ), - ), - migrations.AddField( - model_name="scene", - name="parameters", - field=jsonfield.fields.JSONField(default=dict, blank=True), - ), - migrations.AddField( - model_name="scene", - name="scenario", - field=models.ForeignKey( - to="delft3dworker.Scenario", null=True, on_delete=models.CASCADE - ), - ), - migrations.AlterField( - model_name="template", - name="version", - field=models.IntegerField(blank=True), - ), - ] diff --git a/delft3dworker/migrations/0020_auto_20160422_2304.py b/delft3dworker/migrations/0020_auto_20160422_2304.py deleted file mode 100644 index 0e87527..0000000 --- a/delft3dworker/migrations/0020_auto_20160422_2304.py +++ /dev/null @@ -1,49 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0019_auto_20160421_1319"), - ] - - operations = [ - migrations.RemoveField( - model_name="postprocessingtask", - name="celerytask_ptr", - ), - migrations.RemoveField( - model_name="postprocessingtask", - name="scene", - ), - migrations.RemoveField( - model_name="processingtask", - name="celerytask_ptr", - ), - migrations.RemoveField( - model_name="processingtask", - name="scene", - ), - migrations.RemoveField( - model_name="simulationtask", - name="celerytask_ptr", - ), - migrations.RemoveField( - model_name="simulationtask", - name="scene", - ), - migrations.DeleteModel( - name="CeleryTask", - ), - migrations.DeleteModel( - name="PostprocessingTask", - ), - migrations.DeleteModel( - name="ProcessingTask", - ), - migrations.DeleteModel( - name="SimulationTask", - ), - ] diff --git a/delft3dworker/migrations/0021_auto_20160525_1826.py b/delft3dworker/migrations/0021_auto_20160525_1826.py deleted file mode 100644 index e25c5f9..0000000 --- a/delft3dworker/migrations/0021_auto_20160525_1826.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import jsonfield.fields -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0020_auto_20160422_2304"), - ] - - operations = [ - migrations.RenameField( - model_name="scenario", - old_name="parameters", - new_name="input_parameters", - ), - migrations.AddField( - model_name="scenario", - name="scenes_parameters", - field=jsonfield.fields.JSONField(default=dict, blank=True), - ), - ] diff --git a/delft3dworker/migrations/0022_auto_20160525_1906.py b/delft3dworker/migrations/0022_auto_20160525_1906.py deleted file mode 100644 index d084b02..0000000 --- a/delft3dworker/migrations/0022_auto_20160525_1906.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0021_auto_20160525_1826"), - ] - - operations = [ - migrations.RenameField( - model_name="scenario", - old_name="input_parameters", - new_name="parameters", - ), - ] diff --git a/delft3dworker/migrations/0023_auto_20160531_0851.py b/delft3dworker/migrations/0023_auto_20160531_0851.py deleted file mode 100644 index e44d954..0000000 --- a/delft3dworker/migrations/0023_auto_20160531_0851.py +++ /dev/null @@ -1,57 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import jsonfield.fields -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0022_auto_20160525_1906"), - ] - - operations = [ - migrations.RenameField( - model_name="template", - old_name="templatename", - new_name="name", - ), - migrations.RenameField( - model_name="template", - old_name="variables", - new_name="sections", - ), - migrations.RemoveField( - model_name="template", - name="description", - ), - migrations.RemoveField( - model_name="template", - name="email", - ), - migrations.RemoveField( - model_name="template", - name="groups", - ), - migrations.RemoveField( - model_name="template", - name="label", - ), - migrations.RemoveField( - model_name="template", - name="model", - ), - migrations.RemoveField( - model_name="template", - name="site", - ), - migrations.RemoveField( - model_name="template", - name="version", - ), - migrations.AddField( - model_name="template", - name="meta", - field=jsonfield.fields.JSONField(default=dict, blank=True), - ), - ] diff --git a/delft3dworker/migrations/0024_auto_20160602_0715.py b/delft3dworker/migrations/0024_auto_20160602_0715.py deleted file mode 100644 index 7949809..0000000 --- a/delft3dworker/migrations/0024_auto_20160602_0715.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0023_auto_20160531_0851"), - ] - - operations = [ - migrations.AlterField( - model_name="scenario", - name="template", - field=models.ForeignKey( - to="delft3dworker.Template", null=True, on_delete=models.CASCADE - ), - ), - ] diff --git a/delft3dworker/migrations/0025_auto_20160602_0955.py b/delft3dworker/migrations/0025_auto_20160602_0955.py deleted file mode 100644 index d3a9826..0000000 --- a/delft3dworker/migrations/0025_auto_20160602_0955.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0024_auto_20160602_0715"), - ] - - operations = [ - migrations.RenameField( - model_name="scenario", - old_name="template", - new_name="template_url", - ), - migrations.RenameField( - model_name="scene", - old_name="scenario", - new_name="scenario_url", - ), - ] diff --git a/delft3dworker/migrations/0025_auto_20160602_1100.py b/delft3dworker/migrations/0025_auto_20160602_1100.py deleted file mode 100644 index 3749e18..0000000 --- a/delft3dworker/migrations/0025_auto_20160602_1100.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ("delft3dworker", "0024_auto_20160602_0715"), - ] - - operations = [ - migrations.AddField( - model_name="scenario", - name="owner_url", - field=models.ForeignKey( - to=settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE - ), - ), - migrations.AddField( - model_name="scene", - name="owner_url", - field=models.ForeignKey( - to=settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE - ), - ), - ] diff --git a/delft3dworker/migrations/0026_auto_20160602_1334.py b/delft3dworker/migrations/0026_auto_20160602_1334.py deleted file mode 100644 index bb7a23d..0000000 --- a/delft3dworker/migrations/0026_auto_20160602_1334.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0025_auto_20160602_0955"), - ] - - operations = [ - migrations.RenameField( - model_name="scenario", - old_name="template_url", - new_name="template", - ), - migrations.RenameField( - model_name="scene", - old_name="scenario_url", - new_name="scenario", - ), - ] diff --git a/delft3dworker/migrations/0026_merge.py b/delft3dworker/migrations/0026_merge.py deleted file mode 100644 index 4a12e1e..0000000 --- a/delft3dworker/migrations/0026_merge.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0025_auto_20160602_0955"), - ("delft3dworker", "0025_auto_20160602_1100"), - ] - - operations = [] diff --git a/delft3dworker/migrations/0027_auto_20160602_1435.py b/delft3dworker/migrations/0027_auto_20160602_1435.py deleted file mode 100644 index d4960fd..0000000 --- a/delft3dworker/migrations/0027_auto_20160602_1435.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0026_auto_20160602_1334"), - ] - - operations = [ - migrations.AlterField( - model_name="scenario", - name="template", - field=models.ForeignKey( - blank=True, - to="delft3dworker.Template", - null=True, - on_delete=models.CASCADE, - ), - ), - ] diff --git a/delft3dworker/migrations/0027_merge.py b/delft3dworker/migrations/0027_merge.py deleted file mode 100644 index e02a3c0..0000000 --- a/delft3dworker/migrations/0027_merge.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0026_merge"), - ("delft3dworker", "0026_auto_20160602_1334"), - ] - - operations = [] diff --git a/delft3dworker/migrations/0028_auto_20160602_1433.py b/delft3dworker/migrations/0028_auto_20160602_1433.py deleted file mode 100644 index e43dd3b..0000000 --- a/delft3dworker/migrations/0028_auto_20160602_1433.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0027_merge"), - ] - - operations = [ - migrations.RenameField( - model_name="scenario", - old_name="owner_url", - new_name="owner", - ), - migrations.RenameField( - model_name="scene", - old_name="owner_url", - new_name="owner", - ), - ] diff --git a/delft3dworker/migrations/0029_auto_20160531_0908.py b/delft3dworker/migrations/0029_auto_20160531_0908.py deleted file mode 100644 index 089bdfa..0000000 --- a/delft3dworker/migrations/0029_auto_20160531_0908.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0028_auto_20160602_1433"), - ] - - operations = [ - migrations.AlterModelOptions( - name="scenario", - options={ - "default_permissions": ("view",), - "permissions": (("view_scenario", "View Scenario"),), - }, - ), - migrations.AlterModelOptions( - name="scene", - options={ - "default_permissions": ("view",), - "permissions": (("view_scene", "View Scene"),), - }, - ), - migrations.AlterModelOptions( - name="template", - options={ - "default_permissions": ("view",), - "permissions": (("view_template", "View Template"),), - }, - ), - ] diff --git a/delft3dworker/migrations/0029_merge.py b/delft3dworker/migrations/0029_merge.py deleted file mode 100644 index 8b81b7b..0000000 --- a/delft3dworker/migrations/0029_merge.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0028_auto_20160602_1433"), - ("delft3dworker", "0027_auto_20160602_1435"), - ] - - operations = [] diff --git a/delft3dworker/migrations/0030_auto_20160531_0922.py b/delft3dworker/migrations/0030_auto_20160531_0922.py deleted file mode 100644 index f9cd542..0000000 --- a/delft3dworker/migrations/0030_auto_20160531_0922.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0029_auto_20160531_0908"), - ] - - operations = [ - migrations.AlterModelOptions( - name="scenario", - options={"permissions": (("view_scenario", "View Scenario"),)}, - ), - migrations.AlterModelOptions( - name="scene", - options={"permissions": (("view_scene", "View Scene"),)}, - ), - ] diff --git a/delft3dworker/migrations/0031_auto_20160531_0923.py b/delft3dworker/migrations/0031_auto_20160531_0923.py deleted file mode 100644 index 2f0ab35..0000000 --- a/delft3dworker/migrations/0031_auto_20160531_0923.py +++ /dev/null @@ -1,17 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0030_auto_20160531_0922"), - ] - - operations = [ - migrations.AlterModelOptions( - name="template", - options={"permissions": (("view_template", "View Template"),)}, - ), - ] diff --git a/delft3dworker/migrations/0032_merge.py b/delft3dworker/migrations/0032_merge.py deleted file mode 100644 index 1586bc5..0000000 --- a/delft3dworker/migrations/0032_merge.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0027_auto_20160602_1435"), - ("delft3dworker", "0031_auto_20160531_0923"), - ] - - operations = [] diff --git a/delft3dworker/migrations/0033_merge.py b/delft3dworker/migrations/0033_merge.py deleted file mode 100644 index 56bafb8..0000000 --- a/delft3dworker/migrations/0033_merge.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0029_merge"), - ("delft3dworker", "0032_merge"), - ] - - operations = [] diff --git a/delft3dworker/migrations/0034_scene_shared.py b/delft3dworker/migrations/0034_scene_shared.py deleted file mode 100644 index b6359e3..0000000 --- a/delft3dworker/migrations/0034_scene_shared.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0033_merge"), - ] - - operations = [ - migrations.AddField( - model_name="scene", - name="shared", - field=models.CharField( - default="p", - max_length=1, - choices=[("p", "private"), ("c", "company"), ("w", "world")], - ), - preserve_default=False, - ), - ] diff --git a/delft3dworker/migrations/0035_auto_20160527_1326.py b/delft3dworker/migrations/0035_auto_20160527_1326.py deleted file mode 100644 index addd428..0000000 --- a/delft3dworker/migrations/0035_auto_20160527_1326.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0034_scene_shared"), - ] - - operations = [ - migrations.AddField( - model_name="scene", - name="parameters_hash", - field=models.CharField(unique=True, max_length=64, blank=True), - ), - migrations.RemoveField( - model_name="scene", - name="scenario", - ), - migrations.AddField( - model_name="scene", - name="scenario", - field=models.ManyToManyField(to="delft3dworker.Scenario", null=True), - ), - ] diff --git a/delft3dworker/migrations/0036_auto_20160527_1445.py b/delft3dworker/migrations/0036_auto_20160527_1445.py deleted file mode 100644 index e8f7542..0000000 --- a/delft3dworker/migrations/0036_auto_20160527_1445.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0035_auto_20160527_1326"), - ] - - operations = [ - migrations.AlterField( - model_name="scene", - name="parameters_hash", - field=models.CharField(max_length=64, blank=True), - ), - ] diff --git a/delft3dworker/migrations/0037_auto_20160608_2304.py b/delft3dworker/migrations/0037_auto_20160608_2304.py deleted file mode 100644 index ba38fbf..0000000 --- a/delft3dworker/migrations/0037_auto_20160608_2304.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0036_auto_20160527_1445"), - ] - - operations = [ - migrations.AlterField( - model_name="scene", - name="scenario", - field=models.ManyToManyField(to="delft3dworker.Scenario"), - ), - ] diff --git a/delft3dworker/migrations/0038_searchform.py b/delft3dworker/migrations/0038_searchform.py deleted file mode 100644 index 8a566ae..0000000 --- a/delft3dworker/migrations/0038_searchform.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import jsonfield.fields -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0037_auto_20160608_2304"), - ] - - operations = [ - migrations.CreateModel( - name="SearchForm", - fields=[ - ( - "id", - models.AutoField( - verbose_name="ID", - serialize=False, - auto_created=True, - primary_key=True, - ), - ), - ("name", models.CharField(max_length=256)), - ("sections", jsonfield.fields.JSONField(default=dict, blank=True)), - ], - ), - ] diff --git a/delft3dworker/migrations/0039_auto_20160706_1418.py b/delft3dworker/migrations/0039_auto_20160706_1418.py deleted file mode 100644 index 1d705d5..0000000 --- a/delft3dworker/migrations/0039_auto_20160706_1418.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import jsonfield.fields -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0038_searchform"), - ] - - operations = [ - migrations.AlterField( - model_name="searchform", - name="sections", - field=jsonfield.fields.JSONField(default=[]), - ), - ] diff --git a/delft3dworker/migrations/0040_searchform_templates.py b/delft3dworker/migrations/0040_searchform_templates.py deleted file mode 100644 index d422f1a..0000000 --- a/delft3dworker/migrations/0040_searchform_templates.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import jsonfield.fields -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0039_auto_20160706_1418"), - ] - - operations = [ - migrations.AddField( - model_name="searchform", - name="templates", - field=jsonfield.fields.JSONField(default=[]), - ), - ] diff --git a/delft3dworker/migrations/0041_auto_20160708_0918.py b/delft3dworker/migrations/0041_auto_20160708_0918.py deleted file mode 100644 index 11dde1d..0000000 --- a/delft3dworker/migrations/0041_auto_20160708_0918.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0040_searchform_templates"), - ] - - operations = [ - migrations.AlterField( - model_name="scene", - name="scenario", - field=models.ManyToManyField(to="delft3dworker.Scenario", blank=True), - ), - ] diff --git a/delft3dworker/migrations/0042_remove_scene_suid.py b/delft3dworker/migrations/0042_remove_scene_suid.py deleted file mode 100644 index f8ed79d..0000000 --- a/delft3dworker/migrations/0042_remove_scene_suid.py +++ /dev/null @@ -1,17 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0041_auto_20160708_0918"), - ] - - operations = [ - migrations.RemoveField( - model_name="scene", - name="suid", - ), - ] diff --git a/delft3dworker/migrations/0043_scene_suid.py b/delft3dworker/migrations/0043_scene_suid.py deleted file mode 100644 index bf53788..0000000 --- a/delft3dworker/migrations/0043_scene_suid.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import uuid - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0042_remove_scene_suid"), - ] - - operations = [ - migrations.AddField( - model_name="scene", - name="suid", - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - ] diff --git a/delft3dworker/migrations/0044_auto_20160713_1222.py b/delft3dworker/migrations/0044_auto_20160713_1222.py deleted file mode 100644 index 08905e5..0000000 --- a/delft3dworker/migrations/0044_auto_20160713_1222.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0043_scene_suid"), - ] - - operations = [ - migrations.AddField( - model_name="scenario", - name="progress", - field=models.IntegerField(default=0), - ), - migrations.AddField( - model_name="scenario", - name="state", - field=models.CharField(max_length=64, blank=True), - ), - migrations.AddField( - model_name="scene", - name="progress", - field=models.IntegerField(default=0), - ), - ] diff --git a/delft3dworker/migrations/0045_auto_20160714_0811.py b/delft3dworker/migrations/0045_auto_20160714_0811.py deleted file mode 100644 index 056dd9f..0000000 --- a/delft3dworker/migrations/0045_auto_20160714_0811.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0044_auto_20160713_1222"), - ] - - operations = [ - migrations.AlterField( - model_name="scenario", - name="state", - field=models.CharField(default="CREATED", max_length=64), - ), - migrations.AlterField( - model_name="scene", - name="state", - field=models.CharField(default="CREATED", max_length=256), - ), - ] diff --git a/delft3dworker/migrations/0046_auto_20160715_1022.py b/delft3dworker/migrations/0046_auto_20160715_1022.py deleted file mode 100644 index b80a8a2..0000000 --- a/delft3dworker/migrations/0046_auto_20160715_1022.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0045_auto_20160714_0811"), - ] - - operations = [ - migrations.AlterField( - model_name="scene", - name="task_id", - field=models.CharField(max_length=256, blank=True), - ), - ] diff --git a/delft3dworker/migrations/0047_container.py b/delft3dworker/migrations/0047_container.py deleted file mode 100644 index 172f29b..0000000 --- a/delft3dworker/migrations/0047_container.py +++ /dev/null @@ -1,68 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0046_auto_20160715_1022"), - ] - - operations = [ - migrations.CreateModel( - name="Container", - fields=[ - ( - "id", - models.AutoField( - verbose_name="ID", - serialize=False, - auto_created=True, - primary_key=True, - ), - ), - ("docker_id", models.CharField(unique=True, max_length=64, blank=True)), - ( - "container_type", - models.CharField( - blank=True, - max_length=16, - choices=[ - ("preprocess", "preprocess"), - ("delft3d", "delft3d"), - ("process", "process"), - ("postprocess", "postprocess"), - ("export", "export"), - ], - ), - ), - ( - "desired_state", - models.CharField( - blank=True, - max_length=16, - choices=[ - ("non-existent", "non-existent"), - ("created", "created"), - ("running", "running"), - ("exited", "exited"), - ], - ), - ), - ( - "docker_state", - models.CharField( - blank=True, - max_length=16, - choices=[ - ("non-existent", "non-existent"), - ("created", "created"), - ("running", "running"), - ("exited", "exited"), - ], - ), - ), - ], - ), - ] diff --git a/delft3dworker/migrations/0048_container_scene.py b/delft3dworker/migrations/0048_container_scene.py deleted file mode 100644 index 5e0089d..0000000 --- a/delft3dworker/migrations/0048_container_scene.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0047_container"), - ] - - operations = [ - migrations.AddField( - model_name="container", - name="scene", - field=models.ForeignKey( - default=None, to="delft3dworker.Scene", on_delete=models.CASCADE - ), - preserve_default=False, - ), - ] diff --git a/delft3dworker/migrations/0049_auto_20160825_0932.py b/delft3dworker/migrations/0049_auto_20160825_0932.py deleted file mode 100644 index 14685e7..0000000 --- a/delft3dworker/migrations/0049_auto_20160825_0932.py +++ /dev/null @@ -1,47 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0048_container_scene"), - ] - - operations = [ - migrations.AlterField( - model_name="container", - name="desired_state", - field=models.CharField( - default="non-existent", - max_length=16, - choices=[ - ("non-existent", "non-existent"), - ("created", "created"), - ("restarting", "restarting"), - ("running", "running"), - ("paused", "paused"), - ("exited", "exited"), - ("dead", "dead"), - ], - ), - ), - migrations.AlterField( - model_name="container", - name="docker_state", - field=models.CharField( - default="non-existent", - max_length=16, - choices=[ - ("non-existent", "non-existent"), - ("created", "created"), - ("restarting", "restarting"), - ("running", "running"), - ("paused", "paused"), - ("exited", "exited"), - ("dead", "dead"), - ], - ), - ), - ] diff --git a/delft3dworker/migrations/0050_auto_20160825_0934.py b/delft3dworker/migrations/0050_auto_20160825_0934.py deleted file mode 100644 index 2835b09..0000000 --- a/delft3dworker/migrations/0050_auto_20160825_0934.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0049_auto_20160825_0932"), - ] - - operations = [ - migrations.AlterField( - model_name="container", - name="docker_id", - field=models.CharField(default="", unique=True, max_length=64), - ), - ] diff --git a/delft3dworker/migrations/0051_auto_20160825_0935.py b/delft3dworker/migrations/0051_auto_20160825_0935.py deleted file mode 100644 index 15b55ab..0000000 --- a/delft3dworker/migrations/0051_auto_20160825_0935.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0050_auto_20160825_0934"), - ] - - operations = [ - migrations.AlterField( - model_name="container", - name="docker_id", - field=models.CharField(default="", max_length=64, blank=True), - ), - ] diff --git a/delft3dworker/migrations/0052_auto_20160825_1404.py b/delft3dworker/migrations/0052_auto_20160825_1404.py deleted file mode 100644 index 323f721..0000000 --- a/delft3dworker/migrations/0052_auto_20160825_1404.py +++ /dev/null @@ -1,56 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import uuid - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0051_auto_20160825_0935"), - ] - - operations = [ - migrations.AddField( - model_name="container", - name="task_uuid", - field=models.UUIDField(default=uuid.uuid4, editable=False, blank=True), - ), - migrations.AlterField( - model_name="container", - name="desired_state", - field=models.CharField( - default="non-existent", - max_length=16, - choices=[ - ("non-existent", "non-existent"), - ("created", "created"), - ("restarting", "restarting"), - ("running", "running"), - ("paused", "paused"), - ("exited", "exited"), - ("dead", "dead"), - ("unknown", "unknown"), - ], - ), - ), - migrations.AlterField( - model_name="container", - name="docker_state", - field=models.CharField( - default="non-existent", - max_length=16, - choices=[ - ("non-existent", "non-existent"), - ("created", "created"), - ("restarting", "restarting"), - ("running", "running"), - ("paused", "paused"), - ("exited", "exited"), - ("dead", "dead"), - ("unknown", "unknown"), - ], - ), - ), - ] diff --git a/delft3dworker/migrations/0053_auto_20160826_0747.py b/delft3dworker/migrations/0053_auto_20160826_0747.py deleted file mode 100644 index 7ca90e4..0000000 --- a/delft3dworker/migrations/0053_auto_20160826_0747.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import uuid - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0052_auto_20160825_1404"), - ] - - operations = [ - migrations.AlterField( - model_name="container", - name="task_uuid", - field=models.UUIDField(default=uuid.uuid4, blank=True), - ), - ] diff --git a/delft3dworker/migrations/0054_auto_20160826_0747.py b/delft3dworker/migrations/0054_auto_20160826_0747.py deleted file mode 100644 index 9112e3d..0000000 --- a/delft3dworker/migrations/0054_auto_20160826_0747.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import uuid - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0053_auto_20160826_0747"), - ] - - operations = [ - migrations.AlterField( - model_name="container", - name="task_uuid", - field=models.UUIDField(default=uuid.uuid4, null=True, blank=True), - ), - ] diff --git a/delft3dworker/migrations/0055_container_docker_log.py b/delft3dworker/migrations/0055_container_docker_log.py deleted file mode 100644 index 2eccd21..0000000 --- a/delft3dworker/migrations/0055_container_docker_log.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0054_auto_20160826_0747"), - ] - - operations = [ - migrations.AddField( - model_name="container", - name="docker_log", - field=models.TextField(default="", blank=True), - ), - ] diff --git a/delft3dworker/migrations/0056_auto_20160825_0548.py b/delft3dworker/migrations/0056_auto_20160825_0548.py deleted file mode 100644 index 9491e3f..0000000 --- a/delft3dworker/migrations/0056_auto_20160825_0548.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0055_container_docker_log"), - ] - - operations = [ - migrations.AlterField( - model_name="container", - name="docker_id", - field=models.CharField( - default="", max_length=64, db_index=True, blank=True - ), - ), - migrations.AlterField( - model_name="container", - name="task_uuid", - field=models.UUIDField(default=None, null=True, blank=True), - ), - ] diff --git a/delft3dworker/migrations/0057_auto_20160829_1429.py b/delft3dworker/migrations/0057_auto_20160829_1429.py deleted file mode 100644 index bab893b..0000000 --- a/delft3dworker/migrations/0057_auto_20160829_1429.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0056_auto_20160825_0548"), - ] - - operations = [ - migrations.AlterField( - model_name="container", - name="container_type", - field=models.CharField( - default="preprocess", - max_length=16, - choices=[ - ("preprocess", "preprocess"), - ("delft3d", "delft3d"), - ("process", "process"), - ("postprocess", "postprocess"), - ("export", "export"), - ], - ), - ), - ] diff --git a/delft3dworker/migrations/0058_container_task_starttime.py b/delft3dworker/migrations/0058_container_task_starttime.py deleted file mode 100644 index 2bb2190..0000000 --- a/delft3dworker/migrations/0058_container_task_starttime.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import datetime - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0057_auto_20160829_1429"), - ] - - operations = [ - migrations.AddField( - model_name="container", - name="task_starttime", - field=models.DateTimeField( - default=datetime.datetime( - 2016, 8, 30, 9, 36, 4, 550600, tzinfo=datetime.timezone.utc - ), - blank=True, - ), - ), - ] diff --git a/delft3dworker/migrations/0058_scene_phase.py b/delft3dworker/migrations/0058_scene_phase.py deleted file mode 100644 index c457713..0000000 --- a/delft3dworker/migrations/0058_scene_phase.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0057_auto_20160829_1429"), - ] - - operations = [ - migrations.AddField( - model_name="scene", - name="phase", - field=models.PositiveSmallIntegerField( - default=0, - choices=[ - (0, "Phase 0"), - (1, "Phase 1"), - (2, "Phase 2"), - (3, "Phase 3"), - (4, "Phase 4"), - (5, "Phase 5"), - (6, "Phase 6"), - (7, "Phase 7"), - ], - ), - ), - ] diff --git a/delft3dworker/migrations/0059_auto_20160830_1042.py b/delft3dworker/migrations/0059_auto_20160830_1042.py deleted file mode 100644 index b28e00b..0000000 --- a/delft3dworker/migrations/0059_auto_20160830_1042.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import datetime - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0058_container_task_starttime"), - ] - - operations = [ - migrations.AddField( - model_name="container", - name="container_starttime", - field=models.DateTimeField( - default=datetime.datetime( - 2016, 8, 30, 10, 42, 12, 820124, tzinfo=datetime.timezone.utc - ), - blank=True, - ), - ), - migrations.AddField( - model_name="container", - name="container_stoptime", - field=models.DateTimeField( - default=datetime.datetime( - 2016, 8, 30, 10, 42, 12, 820153, tzinfo=datetime.timezone.utc - ), - blank=True, - ), - ), - migrations.AlterField( - model_name="container", - name="task_starttime", - field=models.DateTimeField( - default=datetime.datetime( - 2016, 8, 30, 10, 42, 12, 820170, tzinfo=datetime.timezone.utc - ), - blank=True, - ), - ), - ] diff --git a/delft3dworker/migrations/0059_auto_20160830_1304.py b/delft3dworker/migrations/0059_auto_20160830_1304.py deleted file mode 100644 index d41c8c5..0000000 --- a/delft3dworker/migrations/0059_auto_20160830_1304.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import django.utils.timezone -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0058_container_task_starttime"), - ] - - operations = [ - migrations.AlterField( - model_name="container", - name="task_starttime", - field=models.DateTimeField(default=django.utils.timezone.now, blank=True), - ), - ] diff --git a/delft3dworker/migrations/0059_merge.py b/delft3dworker/migrations/0059_merge.py deleted file mode 100644 index deac7ef..0000000 --- a/delft3dworker/migrations/0059_merge.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0058_scene_phase"), - ("delft3dworker", "0058_container_task_starttime"), - ] - - operations = [] diff --git a/delft3dworker/migrations/0060_auto_20160830_1258.py b/delft3dworker/migrations/0060_auto_20160830_1258.py deleted file mode 100644 index 67ead46..0000000 --- a/delft3dworker/migrations/0060_auto_20160830_1258.py +++ /dev/null @@ -1,53 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import datetime - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0059_merge"), - ] - - operations = [ - migrations.AlterField( - model_name="container", - name="task_starttime", - field=models.DateTimeField( - default=datetime.datetime( - 2016, 8, 30, 12, 58, 18, 702032, tzinfo=datetime.timezone.utc - ), - blank=True, - ), - ), - migrations.AlterField( - model_name="scene", - name="phase", - field=models.PositiveSmallIntegerField( - default=0, - choices=[ - (0, "New"), - (1, "Creating containers..."), - (2, "Created containers"), - (3, "Starting preprocessing..."), - (4, "Running preprocessing..."), - (5, "Finished preprocessing"), - (6, "Idle"), - (7, "Starting simulation..."), - (8, "Running simulation..."), - (9, "Finished simulation"), - (10, "Starting postprocessing..."), - (11, "Running postprocessing..."), - (12, "Finished postprocessing"), - (13, "Starting container remove..."), - (14, "Removing containers..."), - (15, "Containers removed"), - (1000, "Starting Abort..."), - (1001, "Aborting..."), - (1002, "Finished Abort"), - ], - ), - ), - ] diff --git a/delft3dworker/migrations/0060_merge.py b/delft3dworker/migrations/0060_merge.py deleted file mode 100644 index 3c00a60..0000000 --- a/delft3dworker/migrations/0060_merge.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0059_auto_20160830_1042"), - ("delft3dworker", "0059_auto_20160830_1304"), - ] - - operations = [] diff --git a/delft3dworker/migrations/0061_auto_20160830_1300.py b/delft3dworker/migrations/0061_auto_20160830_1300.py deleted file mode 100644 index 4070b13..0000000 --- a/delft3dworker/migrations/0061_auto_20160830_1300.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import datetime - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0060_auto_20160830_1258"), - ] - - operations = [ - migrations.AlterField( - model_name="container", - name="task_starttime", - field=models.DateTimeField( - default=datetime.datetime( - 2016, 8, 30, 13, 0, 33, 231999, tzinfo=datetime.timezone.utc - ), - blank=True, - ), - ), - ] diff --git a/delft3dworker/migrations/0061_auto_20160830_1329.py b/delft3dworker/migrations/0061_auto_20160830_1329.py deleted file mode 100644 index 7b4aa54..0000000 --- a/delft3dworker/migrations/0061_auto_20160830_1329.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import django.utils.timezone -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0060_merge"), - ] - - operations = [ - migrations.AlterField( - model_name="container", - name="container_starttime", - field=models.DateTimeField(default=django.utils.timezone.now, blank=True), - ), - migrations.AlterField( - model_name="container", - name="container_stoptime", - field=models.DateTimeField(default=django.utils.timezone.now, blank=True), - ), - migrations.AlterField( - model_name="container", - name="task_starttime", - field=models.DateTimeField(default=django.utils.timezone.now, blank=True), - ), - ] diff --git a/delft3dworker/migrations/0062_auto_20160830_1300.py b/delft3dworker/migrations/0062_auto_20160830_1300.py deleted file mode 100644 index 4279782..0000000 --- a/delft3dworker/migrations/0062_auto_20160830_1300.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import datetime - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0061_auto_20160830_1300"), - ] - - operations = [ - migrations.AlterField( - model_name="container", - name="task_starttime", - field=models.DateTimeField( - default=datetime.datetime( - 2016, 8, 30, 13, 0, 42, 990726, tzinfo=datetime.timezone.utc - ), - blank=True, - ), - ), - ] diff --git a/delft3dworker/migrations/0063_auto_20160830_1301.py b/delft3dworker/migrations/0063_auto_20160830_1301.py deleted file mode 100644 index d6fa629..0000000 --- a/delft3dworker/migrations/0063_auto_20160830_1301.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import django.utils.timezone -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0062_auto_20160830_1300"), - ] - - operations = [ - migrations.AlterField( - model_name="container", - name="task_starttime", - field=models.DateTimeField(default=django.utils.timezone.now, blank=True), - ), - ] diff --git a/delft3dworker/migrations/0064_merge.py b/delft3dworker/migrations/0064_merge.py deleted file mode 100644 index f43b6b0..0000000 --- a/delft3dworker/migrations/0064_merge.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0063_auto_20160830_1301"), - ("delft3dworker", "0059_auto_20160830_1304"), - ] - - operations = [] diff --git a/delft3dworker/migrations/0065_auto_20160831_1441.py b/delft3dworker/migrations/0065_auto_20160831_1441.py deleted file mode 100644 index a44a7e8..0000000 --- a/delft3dworker/migrations/0065_auto_20160831_1441.py +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0064_merge"), - ] - - operations = [ - migrations.AlterField( - model_name="scene", - name="phase", - field=models.PositiveSmallIntegerField( - default=0, - choices=[ - (0, "New"), - (1, "Creating containers..."), - (2, "Created containers"), - (3, "Starting preprocessing..."), - (4, "Running preprocessing..."), - (5, "Finished preprocessing"), - (6, "Idle: waiting for user input"), - (7, "Starting simulation..."), - (8, "Running simulation..."), - (9, "Finished simulation"), - (10, "Starting postprocessing..."), - (11, "Running postprocessing..."), - (12, "Finished postprocessing"), - (13, "Starting container remove..."), - (14, "Removing containers..."), - (15, "Containers removed"), - (1000, "Starting Abort..."), - (1001, "Aborting..."), - (1002, "Finished Abort"), - ], - ), - ), - ] diff --git a/delft3dworker/migrations/0065_merge.py b/delft3dworker/migrations/0065_merge.py deleted file mode 100644 index 56226b9..0000000 --- a/delft3dworker/migrations/0065_merge.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0061_auto_20160830_1329"), - ("delft3dworker", "0064_merge"), - ] - - operations = [] diff --git a/delft3dworker/migrations/0066_auto_20160831_1311.py b/delft3dworker/migrations/0066_auto_20160831_1311.py deleted file mode 100644 index c451853..0000000 --- a/delft3dworker/migrations/0066_auto_20160831_1311.py +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0065_merge"), - ] - - operations = [ - migrations.AlterField( - model_name="scene", - name="phase", - field=models.PositiveSmallIntegerField( - default=0, - choices=[ - (0, "New"), - (1, "Creating containers..."), - (2, "Created containers"), - (3, "Starting preprocessing..."), - (4, "Running preprocessing..."), - (5, "Finished preprocessing"), - (6, "Idle: waiting for user input"), - (7, "Starting simulation..."), - (8, "Running simulation..."), - (9, "Finished simulation"), - (10, "Starting postprocessing..."), - (11, "Running postprocessing..."), - (12, "Finished postprocessing"), - (13, "Starting container remove..."), - (14, "Removing containers..."), - (15, "Containers removed"), - (1000, "Starting Abort..."), - (1001, "Aborting..."), - (1002, "Finished Abort"), - ], - ), - ), - ] diff --git a/delft3dworker/migrations/0067_container_container_exitcode.py b/delft3dworker/migrations/0067_container_container_exitcode.py deleted file mode 100644 index 94ee525..0000000 --- a/delft3dworker/migrations/0067_container_container_exitcode.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0066_auto_20160831_1311"), - ] - - operations = [ - migrations.AddField( - model_name="container", - name="container_exitcode", - field=models.PositiveSmallIntegerField(default=0), - ), - ] diff --git a/delft3dworker/migrations/0068_container_container_progress.py b/delft3dworker/migrations/0068_container_container_progress.py deleted file mode 100644 index 9bc30d6..0000000 --- a/delft3dworker/migrations/0068_container_container_progress.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0067_container_container_exitcode"), - ] - - operations = [ - migrations.AddField( - model_name="container", - name="container_progress", - field=models.PositiveSmallIntegerField(default=0), - ), - ] diff --git a/delft3dworker/migrations/0069_merge.py b/delft3dworker/migrations/0069_merge.py deleted file mode 100644 index aa9b8a0..0000000 --- a/delft3dworker/migrations/0069_merge.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0065_auto_20160831_1441"), - ("delft3dworker", "0068_container_container_progress"), - ] - - operations = [] diff --git a/delft3dworker/migrations/0070_auto_20160901_0755.py b/delft3dworker/migrations/0070_auto_20160901_0755.py deleted file mode 100644 index 017d7a8..0000000 --- a/delft3dworker/migrations/0070_auto_20160901_0755.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0069_merge"), - ] - - operations = [ - migrations.AlterField( - model_name="scene", - name="phase", - field=models.PositiveSmallIntegerField( - default=0, - choices=[ - (0, "New"), - (1, "Creating containers..."), - (2, "Created containers"), - (3, "Starting preprocessing..."), - (4, "Running preprocessing..."), - (5, "Finished preprocessing"), - (6, "Idle: waiting for user input"), - (7, "Starting simulation..."), - (8, "Running simulation..."), - (9, "Finished simulation"), - (10, "Stopping simulation..."), - (11, "Starting postprocessing..."), - (12, "Running postprocessing..."), - (13, "Finished postprocessing"), - (14, "Starting export..."), - (15, "Running export..."), - (16, "Finished export"), - (17, "Starting container remove..."), - (18, "Removing containers..."), - (19, "Containers removed"), - (1000, "Starting Abort..."), - (1001, "Aborting..."), - (1002, "Finished Abort"), - ], - ), - ), - ] diff --git a/delft3dworker/migrations/0071_auto_20160830_2301.py b/delft3dworker/migrations/0071_auto_20160830_2301.py deleted file mode 100644 index 07c6e45..0000000 --- a/delft3dworker/migrations/0071_auto_20160830_2301.py +++ /dev/null @@ -1,46 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0070_auto_20160901_0755"), - ] - - operations = [ - migrations.AlterField( - model_name="scene", - name="phase", - field=models.PositiveSmallIntegerField( - default=0, - choices=[ - (0, "New"), - (1, "Creating containers..."), - (2, "Created containers"), - (3, "Starting preprocessing..."), - (4, "Running preprocessing..."), - (5, "Finished preprocessing"), - (6, "Idle: waiting for user input"), - (7, "Starting simulation..."), - (8, "Running simulation..."), - (9, "Finished simulation"), - (10, "Stopping simulation..."), - (11, "Starting postprocessing..."), - (12, "Running postprocessing..."), - (13, "Finished postprocessing"), - (14, "Starting export..."), - (15, "Running export..."), - (16, "Finished export"), - (17, "Starting container remove..."), - (18, "Removing containers..."), - (19, "Containers removed"), - (1000, "Starting Abort..."), - (1001, "Aborting..."), - (1002, "Finished Abort"), - (1003, "Queued"), - ], - ), - ), - ] diff --git a/delft3dworker/migrations/0072_auto_20160830_2334.py b/delft3dworker/migrations/0072_auto_20160830_2334.py deleted file mode 100644 index f7e3a5e..0000000 --- a/delft3dworker/migrations/0072_auto_20160830_2334.py +++ /dev/null @@ -1,47 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0071_auto_20160830_2301"), - ] - - operations = [ - migrations.AlterField( - model_name="scene", - name="phase", - field=models.PositiveSmallIntegerField( - default=0, - choices=[ - (0, "New"), - (1, "Creating containers..."), - (2, "Created containers"), - (3, "Starting preprocessing..."), - (4, "Running preprocessing..."), - (5, "Finished preprocessing"), - (6, "Idle: waiting for user input"), - (7, "Starting simulation..."), - (8, "Running simulation..."), - (9, "Finished simulation"), - (10, "Stopping simulation..."), - (11, "Starting postprocessing..."), - (12, "Running postprocessing..."), - (13, "Finished postprocessing"), - (14, "Starting export..."), - (15, "Running export..."), - (16, "Finished export"), - (17, "Starting container remove..."), - (18, "Removing containers..."), - (19, "Containers removed"), - (20, "Finished"), - (1000, "Starting Abort..."), - (1001, "Aborting..."), - (1002, "Finished Abort"), - (1003, "Queued"), - ], - ), - ), - ] diff --git a/delft3dworker/migrations/0073_auto_20160907_1301.py b/delft3dworker/migrations/0073_auto_20160907_1301.py deleted file mode 100644 index 386d04e..0000000 --- a/delft3dworker/migrations/0073_auto_20160907_1301.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0072_auto_20160830_2334"), - ] - - operations = [ - migrations.AlterField( - model_name="container", - name="container_type", - field=models.CharField( - default="preprocess", - max_length=16, - choices=[ - ("preprocess", "preprocess"), - ("delft3d", "delft3d"), - ("process", "process"), - ("postprocess", "postprocess"), - ("export", "export"), - ("sync_cleanup", "sync_cleanup"), - ], - ), - ), - ] diff --git a/delft3dworker/migrations/0074_auto_20160907_1315.py b/delft3dworker/migrations/0074_auto_20160907_1315.py deleted file mode 100644 index 45d3d7a..0000000 --- a/delft3dworker/migrations/0074_auto_20160907_1315.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0073_auto_20160907_1301"), - ] - - operations = [ - migrations.AlterField( - model_name="scene", - name="phase", - field=models.PositiveSmallIntegerField( - default=0, - choices=[ - (0, "New"), - (1, "Creating containers..."), - (2, "Created containers"), - (3, "Starting preprocessing..."), - (4, "Running preprocessing..."), - (5, "Finished preprocessing"), - (6, "Idle: waiting for user input"), - (7, "Starting simulation..."), - (8, "Running simulation..."), - (9, "Finished simulation"), - (10, "Stopping simulation..."), - (11, "Starting postprocessing..."), - (12, "Running postprocessing..."), - (13, "Finished postprocessing"), - (14, "Starting export..."), - (15, "Running export..."), - (16, "Finished export"), - (17, "Starting container remove..."), - (18, "Removing containers..."), - (19, "Containers removed"), - (20, "Started synchronization"), - (21, "Running synchronization"), - (22, "Finished synchronization"), - (30, "Finished"), - (1000, "Starting Abort..."), - (1001, "Aborting..."), - (1002, "Finished Abort"), - (1003, "Queued"), - ], - ), - ), - ] diff --git a/delft3dworker/migrations/0075_auto_20161012_1147.py b/delft3dworker/migrations/0075_auto_20161012_1147.py deleted file mode 100644 index a02cf64..0000000 --- a/delft3dworker/migrations/0075_auto_20161012_1147.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0074_auto_20160907_1315"), - ] - - operations = [ - migrations.AlterField( - model_name="scene", - name="phase", - field=models.PositiveSmallIntegerField( - default=0, - choices=[ - (0, "New"), - (1, "Creating containers"), - (2, "Created containers"), - (3, "Starting preprocessing"), - (4, "Running preprocessing"), - (5, "Finished preprocessing"), - (6, "Idle: waiting for user input"), - (7, "Starting simulation"), - (8, "Running simulation"), - (9, "Finished simulation"), - (10, "Stopping simulation"), - (11, "Starting postprocessing"), - (12, "Running postprocessing"), - (13, "Finished postprocessing"), - (14, "Starting export"), - (15, "Running export"), - (16, "Finished export"), - (17, "Starting container remove"), - (18, "Removing containers"), - (19, "Containers removed"), - (20, "Started synchronization"), - (21, "Running synchronization"), - (22, "Finished synchronization"), - (30, "Finished"), - (1000, "Starting Abort"), - (1001, "Aborting"), - (1002, "Finished Abort"), - (1003, "Queued"), - ], - ), - ), - ] diff --git a/delft3dworker/migrations/0076_auto_20161012_1241.py b/delft3dworker/migrations/0076_auto_20161012_1241.py deleted file mode 100644 index b6cd43c..0000000 --- a/delft3dworker/migrations/0076_auto_20161012_1241.py +++ /dev/null @@ -1,53 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0075_auto_20161012_1147"), - ] - - operations = [ - migrations.AlterField( - model_name="scene", - name="phase", - field=models.PositiveSmallIntegerField( - default=0, - choices=[ - (0, "New"), - (2, "Creating preprocessing"), - (3, "Starting preprocessing"), - (4, "Running preprocessing"), - (5, "Finished preprocessing"), - (6, "Idle: waiting for user input"), - (10, "Creating simulation"), - (11, "Starting simulation"), - (12, "Running simulation"), - (13, "Finished simulation"), - (14, "Stopping simulation"), - (20, "Creating postprocessing"), - (21, "Starting postprocessing"), - (22, "Running postprocessing"), - (23, "Finished postprocessing"), - (30, "Creating export"), - (31, "Starting export"), - (32, "Running export"), - (33, "Finished export"), - (17, "Starting container remove"), - (18, "Removing containers"), - (19, "Containers removed"), - (40, "Creating synchronization"), - (41, "Started synchronization"), - (42, "Running synchronization"), - (43, "Finished synchronization"), - (50, "Finished"), - (1000, "Starting Abort"), - (1001, "Aborting"), - (1002, "Finished Abort"), - (1003, "Queued"), - ], - ), - ), - ] diff --git a/delft3dworker/migrations/0077_auto_20161018_0925.py b/delft3dworker/migrations/0077_auto_20161018_0925.py deleted file mode 100644 index 79b6f4d..0000000 --- a/delft3dworker/migrations/0077_auto_20161018_0925.py +++ /dev/null @@ -1,58 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0076_auto_20161012_1241"), - ] - - operations = [ - migrations.AddField( - model_name="container", - name="container_log", - field=models.TextField(default="", blank=True), - ), - migrations.AlterField( - model_name="scene", - name="phase", - field=models.PositiveSmallIntegerField( - default=0, - choices=[ - (0, "New"), - (2, "Allocating preprocessing resources"), - (3, "Starting preprocessing"), - (4, "Running preprocessing"), - (5, "Finished preprocessing"), - (6, "Idle: waiting for user input"), - (10, "Allocating simulation resources"), - (11, "Starting simulation"), - (12, "Running simulation"), - (13, "Finished simulation"), - (14, "Stopping simulation"), - (20, "Allocating postprocessing resources"), - (21, "Starting postprocessing"), - (22, "Running postprocessing"), - (23, "Finished postprocessing"), - (30, "Allocating export resources"), - (31, "Starting export"), - (32, "Running export"), - (33, "Finished export"), - (17, "Starting container remove"), - (18, "Removing containers"), - (19, "Containers removed"), - (40, "Allocating synchronization resources"), - (41, "Started synchronization"), - (42, "Running synchronization"), - (43, "Finished synchronization"), - (50, "Finished"), - (1000, "Starting Abort"), - (1001, "Aborting"), - (1002, "Finished Abort"), - (1003, "Queued"), - ], - ), - ), - ] diff --git a/delft3dworker/migrations/0078_auto_20161116_0958.py b/delft3dworker/migrations/0078_auto_20161116_0958.py deleted file mode 100644 index 843092b..0000000 --- a/delft3dworker/migrations/0078_auto_20161116_0958.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import django.utils.timezone -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0077_auto_20161018_0925"), - ] - - operations = [ - migrations.AddField( - model_name="scene", - name="date_created", - field=models.DateTimeField(default=django.utils.timezone.now, blank=True), - ), - migrations.AddField( - model_name="scene", - name="date_started", - field=models.DateTimeField(null=True, blank=True), - ), - ] diff --git a/delft3dworker/migrations/0079_auto_20161118_1341.py b/delft3dworker/migrations/0079_auto_20161118_1341.py deleted file mode 100644 index 2301153..0000000 --- a/delft3dworker/migrations/0079_auto_20161118_1341.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0078_auto_20161116_0958"), - ] - - operations = [ - migrations.AddField( - model_name="container", - name="delft3d_version", - field=models.CharField( - default="Deltares, FLOW2D3D Version 6.02.07.6118", max_length=128 - ), - ), - migrations.AddField( - model_name="container", - name="svn_repos_url", - field=models.URLField( - default="http://delft3dgt.openearth.eu/repos/tags/v0.7.2" - ), - ), - migrations.AddField( - model_name="container", - name="svn_revision", - field=models.CharField(default="356", max_length=16), - ), - ] diff --git a/delft3dworker/migrations/0080_auto_20161121_1302.py b/delft3dworker/migrations/0080_auto_20161121_1302.py deleted file mode 100644 index eacbef6..0000000 --- a/delft3dworker/migrations/0080_auto_20161121_1302.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import jsonfield.fields -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0079_auto_20161118_1341"), - ] - - operations = [ - migrations.RemoveField( - model_name="container", - name="delft3d_version", - ), - migrations.RemoveField( - model_name="container", - name="svn_repos_url", - ), - migrations.RemoveField( - model_name="container", - name="svn_revision", - ), - migrations.AddField( - model_name="container", - name="version", - field=jsonfield.fields.JSONField(default={}), - ), - ] diff --git a/delft3dworker/migrations/0081_auto_20161122_1241.py b/delft3dworker/migrations/0081_auto_20161122_1241.py deleted file mode 100644 index d5901cc..0000000 --- a/delft3dworker/migrations/0081_auto_20161122_1241.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import jsonfield.fields -from django.db import migrations - -import delft3dworker.utils - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0080_auto_20161121_1302"), - ] - - operations = [ - migrations.AlterField( - model_name="container", - name="version", - field=jsonfield.fields.JSONField( - default=delft3dworker.utils.version_default - ), - ), - ] diff --git a/delft3dworker/migrations/0082_auto_20161122_1530.py b/delft3dworker/migrations/0082_auto_20161122_1530.py deleted file mode 100644 index 53e73f1..0000000 --- a/delft3dworker/migrations/0082_auto_20161122_1530.py +++ /dev/null @@ -1,54 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0081_auto_20161122_1241"), - ] - - operations = [ - migrations.AlterField( - model_name="scene", - name="phase", - field=models.PositiveSmallIntegerField( - default=0, - choices=[ - (0, "New"), - (2, "Allocating preprocessing resources"), - (3, "Starting preprocessing"), - (4, "Running preprocessing"), - (5, "Finished preprocessing"), - (6, "Idle: waiting for user input"), - (10, "Allocating simulation resources"), - (11, "Starting simulation"), - (12, "Running simulation"), - (15, "Finishing simulation"), - (13, "Finished simulation"), - (14, "Stopping simulation"), - (20, "Allocating postprocessing resources"), - (21, "Starting postprocessing"), - (22, "Running postprocessing"), - (23, "Finished postprocessing"), - (30, "Allocating export resources"), - (31, "Starting export"), - (32, "Running export"), - (33, "Finished export"), - (17, "Starting container remove"), - (18, "Removing containers"), - (19, "Containers removed"), - (40, "Allocating synchronization resources"), - (41, "Started synchronization"), - (42, "Running synchronization"), - (43, "Finished synchronization"), - (50, "Finished"), - (1000, "Starting Abort"), - (1001, "Aborting"), - (1002, "Finished Abort"), - (1003, "Queued"), - ], - ), - ), - ] diff --git a/delft3dworker/migrations/0083_auto_20170412_0907.py b/delft3dworker/migrations/0083_auto_20170412_0907.py deleted file mode 100644 index ca4ec5d..0000000 --- a/delft3dworker/migrations/0083_auto_20170412_0907.py +++ /dev/null @@ -1,91 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0082_auto_20161122_1530"), - ] - - operations = [ - migrations.AddField( - model_name="scene", - name="workflow", - field=models.PositiveSmallIntegerField( - default=0, - choices=[ - (0, "main workflow"), - (1, "redo processing workflow"), - (2, "redo postprocessing workflow"), - ], - ), - ), - migrations.AlterField( - model_name="container", - name="container_type", - field=models.CharField( - default="preprocess", - max_length=16, - choices=[ - ("preprocess", "preprocess"), - ("delft3d", "delft3d"), - ("process", "process"), - ("postprocess", "postprocess"), - ("export", "export"), - ("sync_cleanup", "sync_cleanup"), - ("sync_rerun", "sync_rerun"), - ], - ), - ), - migrations.AlterField( - model_name="scene", - name="phase", - field=models.PositiveSmallIntegerField( - default=0, - choices=[ - (0, "New"), - (2, "Allocating preprocessing resources"), - (3, "Starting preprocessing"), - (4, "Running preprocessing"), - (5, "Finished preprocessing"), - (6, "Idle: waiting for user input"), - (10, "Allocating simulation resources"), - (11, "Starting simulation"), - (12, "Running simulation"), - (15, "Finishing simulation"), - (13, "Finished simulation"), - (14, "Stopping simulation"), - (60, "Allocating processing resources"), - (61, "Starting processing"), - (62, "Running processing"), - (63, "Finished processing"), - (20, "Allocating postprocessing resources"), - (21, "Starting postprocessing"), - (22, "Running postprocessing"), - (23, "Finished postprocessing"), - (30, "Allocating export resources"), - (31, "Starting export"), - (32, "Running export"), - (33, "Finished export"), - (17, "Starting container remove"), - (18, "Removing containers"), - (19, "Containers removed"), - (40, "Allocating synchronization resources"), - (41, "Started synchronization"), - (42, "Running synchronization"), - (43, "Finished synchronization"), - (50, "Allocating synchronization resources"), - (51, "Started synchronization"), - (52, "Running synchronization"), - (53, "Finished synchronization"), - (500, "Finished"), - (1000, "Starting Abort"), - (1001, "Aborting"), - (1002, "Finished Abort"), - (1003, "Queued"), - ], - ), - ), - ] diff --git a/delft3dworker/migrations/0084_auto_20170419_1510.py b/delft3dworker/migrations/0084_auto_20170419_1510.py deleted file mode 100644 index f84b306..0000000 --- a/delft3dworker/migrations/0084_auto_20170419_1510.py +++ /dev/null @@ -1,62 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import jsonfield.fields -from django.db import migrations, models - -import delft3dworker.models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0083_auto_20170412_0907"), - ] - - operations = [ - migrations.CreateModel( - name="Version_SVN", - fields=[ - ( - "id", - models.AutoField( - verbose_name="ID", - serialize=False, - auto_created=True, - primary_key=True, - ), - ), - ("release", models.CharField(max_length=256, db_index=True)), - ("revision", models.PositiveSmallIntegerField(db_index=True)), - ("versions", jsonfield.fields.JSONField(default={})), - ("url", models.URLField()), - ("changelog", models.CharField(max_length=256)), - ("reviewed", models.BooleanField(default=False)), - ], - ), - migrations.RemoveField( - model_name="container", - name="version", - ), - migrations.AlterField( - model_name="scene", - name="workflow", - field=models.PositiveSmallIntegerField( - default=0, - choices=[ - (0, "main workflow"), - (1, "redo processing workflow"), - (2, "redo postprocessing workflow"), - (3, "redo processing and postprocessing workflow"), - ], - ), - ), - migrations.AddField( - model_name="scene", - name="version", - field=models.ForeignKey( - default=delft3dworker.models.default_svn_version, - to="delft3dworker.Version_SVN", - on_delete=models.CASCADE, - ), - ), - ] diff --git a/delft3dworker/migrations/0084_migrate_scene_finished_state.py b/delft3dworker/migrations/0084_migrate_scene_finished_state.py deleted file mode 100644 index b94d33a..0000000 --- a/delft3dworker/migrations/0084_migrate_scene_finished_state.py +++ /dev/null @@ -1,17 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0083_auto_20170412_0907"), - ] - - operations = [ - migrations.RunSQL( - [("UPDATE delft3dworker_scene SET phase = 500 WHERE phase = 50;")], - [("UPDATE delft3dworker_scene SET phase = 50 WHERE phase = 500;")], - ) - ] diff --git a/delft3dworker/migrations/0085_merge.py b/delft3dworker/migrations/0085_merge.py deleted file mode 100644 index 7eeafc8..0000000 --- a/delft3dworker/migrations/0085_merge.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0084_migrate_scene_finished_state"), - ("delft3dworker", "0084_auto_20170419_1510"), - ] - - operations = [] diff --git a/delft3dworker/migrations/0086_auto_20170425_0852.py b/delft3dworker/migrations/0086_auto_20170425_0852.py deleted file mode 100644 index b3e23e0..0000000 --- a/delft3dworker/migrations/0086_auto_20170425_0852.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0085_merge"), - ] - - operations = [ - migrations.AlterModelOptions( - name="version_svn", - options={ - "ordering": ["-revision"], - "verbose_name": "SVN version", - "verbose_name_plural": "SVN versions", - }, - ), - ] diff --git a/delft3dworker/migrations/0087_auto_20180214_1324.py b/delft3dworker/migrations/0087_auto_20180214_1324.py deleted file mode 100644 index 414c912..0000000 --- a/delft3dworker/migrations/0087_auto_20180214_1324.py +++ /dev/null @@ -1,130 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-02-14 13:24 -from __future__ import unicode_literals - -import django.contrib.postgres.fields.jsonb -from django.db import migrations, models - -import delft3dworker.utils - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0086_auto_20170425_0852"), - ] - - operations = [ - migrations.AlterField( - model_name="container", - name="container_starttime", - field=models.DateTimeField(blank=True, default=delft3dworker.utils.tz_now), - ), - migrations.AlterField( - model_name="container", - name="container_stoptime", - field=models.DateTimeField(blank=True, default=delft3dworker.utils.tz_now), - ), - migrations.AlterField( - model_name="container", - name="task_starttime", - field=models.DateTimeField(blank=True, default=delft3dworker.utils.tz_now), - ), - migrations.AlterField( - model_name="scenario", - name="parameters", - field=django.contrib.postgres.fields.jsonb.JSONField( - blank=True, default={} - ), - ), - migrations.RunSQL( - 'ALTER TABLE delft3dworker_scenario ALTER COLUMN "parameters" TYPE jsonb USING "parameters"::text::jsonb;', - reverse_sql='ALTER TABLE delft3dworker_scenario ALTER COLUMN "parameters" TYPE text USING "parameters"::text;', - ), - migrations.AlterField( - model_name="scenario", - name="scenes_parameters", - field=django.contrib.postgres.fields.jsonb.JSONField( - blank=True, default={} - ), - ), - migrations.RunSQL( - 'ALTER TABLE delft3dworker_scenario ALTER COLUMN "scenes_parameters" TYPE jsonb USING "scenes_parameters"::text::jsonb;', - reverse_sql='ALTER TABLE delft3dworker_scenario ALTER COLUMN "scenes_parameters" TYPE text USING "scenes_parameters"::text;', - ), - migrations.AlterField( - model_name="scene", - name="date_created", - field=models.DateTimeField(blank=True, default=delft3dworker.utils.tz_now), - ), - migrations.AlterField( - model_name="scene", - name="info", - field=django.contrib.postgres.fields.jsonb.JSONField( - blank=True, default={} - ), - ), - migrations.RunSQL( - 'ALTER TABLE delft3dworker_scene ALTER COLUMN "info" TYPE jsonb USING "info"::text::jsonb;', - reverse_sql='ALTER TABLE delft3dworker_scene ALTER COLUMN "info" TYPE text USING "info"::text;', - ), - migrations.AlterField( - model_name="scene", - name="parameters", - field=django.contrib.postgres.fields.jsonb.JSONField( - blank=True, default={} - ), - ), - migrations.RunSQL( - 'ALTER TABLE delft3dworker_scene ALTER COLUMN "parameters" TYPE jsonb USING "parameters"::text::jsonb;', - reverse_sql='ALTER TABLE delft3dworker_scene ALTER COLUMN "parameters" TYPE text USING "parameters"::text;', - ), - migrations.AlterField( - model_name="searchform", - name="sections", - field=django.contrib.postgres.fields.jsonb.JSONField(default=[]), - ), - migrations.RunSQL( - 'ALTER TABLE delft3dworker_searchform ALTER COLUMN "sections" TYPE jsonb USING "sections"::text::jsonb;', - reverse_sql='ALTER TABLE delft3dworker_searchform ALTER COLUMN "sections" TYPE text USING "sections"::text;', - ), - migrations.AlterField( - model_name="searchform", - name="templates", - field=django.contrib.postgres.fields.jsonb.JSONField(default=[]), - ), - migrations.RunSQL( - 'ALTER TABLE delft3dworker_searchform ALTER COLUMN "templates" TYPE jsonb USING "templates"::text::jsonb;', - reverse_sql='ALTER TABLE delft3dworker_searchform ALTER COLUMN "templates" TYPE text USING "templates"::text;', - ), - migrations.AlterField( - model_name="template", - name="meta", - field=django.contrib.postgres.fields.jsonb.JSONField( - blank=True, default={} - ), - ), - migrations.RunSQL( - 'ALTER TABLE delft3dworker_template ALTER COLUMN "meta" TYPE jsonb USING "meta"::text::jsonb;', - reverse_sql='ALTER TABLE delft3dworker_template ALTER COLUMN "meta" TYPE text USING "meta"::text;', - ), - migrations.AlterField( - model_name="template", - name="sections", - field=django.contrib.postgres.fields.jsonb.JSONField( - blank=True, default={} - ), - ), - migrations.RunSQL( - 'ALTER TABLE delft3dworker_template ALTER COLUMN "sections" TYPE jsonb USING "sections"::text::jsonb;', - reverse_sql='ALTER TABLE delft3dworker_template ALTER COLUMN "sections" TYPE text USING "sections"::text;', - ), - migrations.AlterField( - model_name="version_svn", - name="versions", - field=django.contrib.postgres.fields.jsonb.JSONField(default={}), - ), - migrations.RunSQL( - 'ALTER TABLE delft3dworker_version_svn ALTER COLUMN "versions" TYPE jsonb USING "versions"::text::jsonb;', - reverse_sql='ALTER TABLE delft3dworker_version_svn ALTER COLUMN "versions" TYPE text USING "versions"::text;', - ), - ] diff --git a/delft3dworker/migrations/0088_auto_20180529_0942.py b/delft3dworker/migrations/0088_auto_20180529_0942.py deleted file mode 100644 index d6ae390..0000000 --- a/delft3dworker/migrations/0088_auto_20180529_0942.py +++ /dev/null @@ -1,151 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-05-29 09:42 -from __future__ import unicode_literals - -import django.contrib.postgres.fields.jsonb -import django.db.models.deletion -from django.db import migrations, models - -import delft3dworker.utils - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0087_auto_20180214_1324"), - ] - - operations = [ - migrations.CreateModel( - name="Workflow", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("name", models.CharField(max_length=256, unique=True)), - ( - "starttime", - models.DateTimeField( - blank=True, default=delft3dworker.utils.tz_now - ), - ), - ("task_uuid", models.UUIDField(blank=True, default=None, null=True)), - ( - "task_starttime", - models.DateTimeField( - blank=True, default=delft3dworker.utils.tz_now - ), - ), - ( - "desired_state", - models.CharField( - choices=[ - ("non-existent", "Non-existent"), - ("pending", "Pending"), - ("unknown", "Unknown"), - ("running", "Running"), - ("paused", "Running (Suspended)"), - ("succeeded", "Succeeded"), - ("skipped", "Skipped"), - ("failed", "Failed"), - ("error", "Error"), - ], - default="non-existent", - max_length=16, - ), - ), - ( - "cluster_state", - models.CharField( - choices=[ - ("non-existent", "Non-existent"), - ("pending", "Pending"), - ("unknown", "Unknown"), - ("running", "Running"), - ("paused", "Running (Suspended)"), - ("succeeded", "Succeeded"), - ("skipped", "Skipped"), - ("failed", "Failed"), - ("error", "Error"), - ], - default="non-existent", - max_length=16, - ), - ), - ("progress", models.PositiveSmallIntegerField(default=0)), - ], - ), - migrations.RemoveField( - model_name="scene", - name="workflow", - ), - migrations.AddField( - model_name="scene", - name="entrypoint", - field=models.PositiveSmallIntegerField( - choices=[(0, "main workflow")], default=0 - ), - ), - migrations.AddField( - model_name="template", - name="export_options", - field=django.contrib.postgres.fields.jsonb.JSONField( - blank=True, default={} - ), - ), - migrations.AddField( - model_name="template", - name="info", - field=django.contrib.postgres.fields.jsonb.JSONField( - blank=True, - default={ - "channel_network_images": {"images": [], "location": "process/"}, - "delta_fringe_images": {"images": [], "location": "process/"}, - "logfile": {"file": "", "location": "simulation/"}, - "postprocess_output": {}, - "procruns": 0, - "sediment_fraction_images": {"images": [], "location": "process/"}, - "subenvironment_images": {"images": [], "location": "postprocess/"}, - }, - ), - ), - migrations.AddField( - model_name="template", - name="visualisation", - field=django.contrib.postgres.fields.jsonb.JSONField( - blank=True, default={} - ), - ), - migrations.AddField( - model_name="template", - name="yaml_template", - field=models.FileField(default="", upload_to="workflows/"), - ), - migrations.AlterField( - model_name="scene", - name="phase", - field=models.PositiveSmallIntegerField( - choices=[ - (0, "New"), - (6, "Idle: waiting for user input"), - (11, "Starting workflow"), - (12, "Running workflow"), - (13, "Removing workflow"), - (500, "Finished"), - ], - default=0, - ), - ), - migrations.AddField( - model_name="workflow", - name="scene", - field=models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, to="delft3dworker.Scene" - ), - ), - ] diff --git a/delft3dworker/migrations/0089_template_shortname.py b/delft3dworker/migrations/0089_template_shortname.py deleted file mode 100644 index 2de4f42..0000000 --- a/delft3dworker/migrations/0089_template_shortname.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-05-29 18:34 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0088_auto_20180529_0942"), - ] - - operations = [ - migrations.AddField( - model_name="template", - name="shortname", - field=models.CharField(default="", max_length=256), - ), - ] diff --git a/delft3dworker/migrations/0090_auto_20180530_0832.py b/delft3dworker/migrations/0090_auto_20180530_0832.py deleted file mode 100644 index 736a019..0000000 --- a/delft3dworker/migrations/0090_auto_20180530_0832.py +++ /dev/null @@ -1,55 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-05-30 08:32 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0089_template_shortname"), - ] - - operations = [ - migrations.AddField( - model_name="workflow", - name="action_log", - field=models.TextField(blank=True, default=""), - ), - migrations.AddField( - model_name="workflow", - name="cluster_log", - field=models.TextField(blank=True, default=""), - ), - migrations.AddField( - model_name="workflow", - name="yaml", - field=models.FileField(default="", upload_to="workflows/"), - ), - migrations.AlterField( - model_name="scene", - name="phase", - field=models.PositiveSmallIntegerField( - choices=[ - (0, "New"), - (6, "Idle: waiting for user input"), - (11, "Starting workflow"), - (12, "Running workflow"), - (13, "Removing workflow"), - (500, "Finished"), - (501, "Failed"), - ], - default=0, - ), - ), - migrations.AlterField( - model_name="template", - name="shortname", - field=models.CharField(default="gt", max_length=256), - ), - migrations.AlterField( - model_name="template", - name="yaml_template", - field=models.FileField(default="", upload_to="workflow_templates/"), - ), - ] diff --git a/delft3dworker/migrations/0091_auto_20180530_1505.py b/delft3dworker/migrations/0091_auto_20180530_1505.py deleted file mode 100644 index 658a025..0000000 --- a/delft3dworker/migrations/0091_auto_20180530_1505.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-05-30 15:05 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0090_auto_20180530_0832"), - ] - - operations = [ - migrations.RemoveField( - model_name="scene", - name="version", - ), - migrations.DeleteModel( - name="Version_SVN", - ), - ] diff --git a/delft3dworker/migrations/0092_auto_20180530_1506.py b/delft3dworker/migrations/0092_auto_20180530_1506.py deleted file mode 100644 index f3e3ad5..0000000 --- a/delft3dworker/migrations/0092_auto_20180530_1506.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-05-30 15:06 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0091_auto_20180530_1505"), - ] - - operations = [ - migrations.RemoveField( - model_name="container", - name="scene", - ), - migrations.DeleteModel( - name="Container", - ), - ] diff --git a/delft3dworker/migrations/0093_auto_20181112_1250.py b/delft3dworker/migrations/0093_auto_20181112_1250.py deleted file mode 100644 index 8b745a3..0000000 --- a/delft3dworker/migrations/0093_auto_20181112_1250.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.16 on 2018-11-12 12:50 -from __future__ import unicode_literals - -import django.contrib.auth.models -import django.contrib.postgres.fields.jsonb -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("auth", "0008_alter_user_username_max_length"), - ("delft3dworker", "0092_auto_20180530_1506"), - ] - - operations = [ - migrations.CreateModel( - name="GroupUsageSummary", - fields=[], - options={ - "verbose_name": "Group Usage Summary", - "proxy": True, - "verbose_name_plural": "Group Usage Summary", - "indexes": [], - }, - bases=("auth.group",), - managers=[ - ("objects", django.contrib.auth.models.GroupManager()), - ], - ), - migrations.CreateModel( - name="UserUsageSummary", - fields=[], - options={ - "verbose_name": "User Usage Summary", - "proxy": True, - "verbose_name_plural": "User Usage Summary", - "indexes": [], - }, - bases=("auth.user",), - managers=[ - ("objects", django.contrib.auth.models.UserManager()), - ], - ), - migrations.AddField( - model_name="workflow", - name="stoptime", - field=models.DateTimeField(blank=True, null=True), - ), - ] diff --git a/delft3dworker/migrations/0094_auto_20181204_1539.py b/delft3dworker/migrations/0094_auto_20181204_1539.py deleted file mode 100644 index 2e0422b..0000000 --- a/delft3dworker/migrations/0094_auto_20181204_1539.py +++ /dev/null @@ -1,82 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.16 on 2018-12-04 15:39 -from __future__ import unicode_literals - -import django.contrib.postgres.fields.jsonb -import django.db.models.deletion -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0093_auto_20181112_1250"), - ] - - operations = [ - migrations.CreateModel( - name="Version_Docker", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("release", models.CharField(db_index=True, max_length=256)), - ("revision", models.PositiveSmallIntegerField(db_index=True)), - ( - "versions", - django.contrib.postgres.fields.jsonb.JSONField(default={}), - ), - ("changelog", models.CharField(max_length=256)), - ("reviewed", models.BooleanField(default=False)), - ], - options={ - "ordering": ["-revision"], - "verbose_name": "Docker version", - "verbose_name_plural": "Docker versions", - }, - ), - migrations.RemoveField( - model_name="scene", - name="entrypoint", - ), - migrations.AddField( - model_name="workflow", - name="entrypoint", - field=models.CharField(max_length=64, null=True), - ), - migrations.AlterField( - model_name="template", - name="info", - field=django.contrib.postgres.fields.jsonb.JSONField( - blank=True, default={} - ), - ), - migrations.AlterField( - model_name="template", - name="shortname", - field=models.CharField(default={}, max_length=256), - ), - migrations.AddField( - model_name="version_docker", - name="template", - field=models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="versions", - to="delft3dworker.Template", - ), - ), - migrations.AddField( - model_name="workflow", - name="version", - field=models.ForeignKey( - null=True, - on_delete=django.db.models.deletion.CASCADE, - to="delft3dworker.Version_Docker", - ), - ), - ] diff --git a/delft3dworker/migrations/0095_auto_20181204_1559.py b/delft3dworker/migrations/0095_auto_20181204_1559.py deleted file mode 100644 index 330b2ce..0000000 --- a/delft3dworker/migrations/0095_auto_20181204_1559.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.16 on 2018-12-04 15:59 -from __future__ import unicode_literals - -from django.db import migrations, models - -import delft3dworker.models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0094_auto_20181204_1539"), - ] - - operations = [ - migrations.AlterField( - model_name="template", - name="yaml_template", - field=models.FileField( - default="", upload_to=delft3dworker.models.parse_argo_workflow - ), - ), - ] diff --git a/delft3dworker/migrations/0096_auto_20181206_1234.py b/delft3dworker/migrations/0096_auto_20181206_1234.py deleted file mode 100644 index 6d53bbd..0000000 --- a/delft3dworker/migrations/0096_auto_20181206_1234.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.16 on 2018-12-06 12:34 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0095_auto_20181204_1559"), - ] - - operations = [ - migrations.RemoveField( - model_name="version_docker", - name="id", - ), - migrations.AlterField( - model_name="version_docker", - name="revision", - field=models.AutoField(primary_key=True, serialize=False), - ), - ] diff --git a/delft3dworker/migrations/0097_auto_20190211_1126.py b/delft3dworker/migrations/0097_auto_20190211_1126.py deleted file mode 100644 index a0589c1..0000000 --- a/delft3dworker/migrations/0097_auto_20190211_1126.py +++ /dev/null @@ -1,79 +0,0 @@ -# Generated by Django 2.0.10 on 2019-02-11 11:26 - -from django.db import migrations, models - -import delft3dworker.models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0096_auto_20181206_1234"), - ] - - operations = [ - migrations.AlterField( - model_name="scenario", - name="parameters", - field=delft3dworker.models.JSONFieldTransition(blank=True, default=dict), - ), - migrations.AlterField( - model_name="scenario", - name="scenes_parameters", - field=delft3dworker.models.JSONFieldTransition(blank=True, default=dict), - ), - migrations.AlterField( - model_name="scene", - name="info", - field=delft3dworker.models.JSONFieldTransition(blank=True, default=dict), - ), - migrations.AlterField( - model_name="scene", - name="parameters", - field=delft3dworker.models.JSONFieldTransition(blank=True, default=dict), - ), - migrations.AlterField( - model_name="searchform", - name="sections", - field=delft3dworker.models.JSONFieldTransition(default=list), - ), - migrations.AlterField( - model_name="searchform", - name="templates", - field=delft3dworker.models.JSONFieldTransition(default=list), - ), - migrations.AlterField( - model_name="template", - name="export_options", - field=delft3dworker.models.JSONFieldTransition(blank=True, default=dict), - ), - migrations.AlterField( - model_name="template", - name="info", - field=delft3dworker.models.JSONFieldTransition(blank=True, default=dict), - ), - migrations.AlterField( - model_name="template", - name="meta", - field=delft3dworker.models.JSONFieldTransition(blank=True, default=dict), - ), - migrations.AlterField( - model_name="template", - name="sections", - field=delft3dworker.models.JSONFieldTransition(blank=True, default=dict), - ), - migrations.AlterField( - model_name="template", - name="shortname", - field=models.CharField(default=dict, max_length=256), - ), - migrations.AlterField( - model_name="template", - name="visualisation", - field=delft3dworker.models.JSONFieldTransition(blank=True, default=dict), - ), - migrations.AlterField( - model_name="version_docker", - name="versions", - field=delft3dworker.models.JSONFieldTransition(default=dict), - ), - ] diff --git a/delft3dworker/migrations/0098_auto_20200226_1452.py b/delft3dworker/migrations/0098_auto_20200226_1452.py deleted file mode 100644 index 6d1693e..0000000 --- a/delft3dworker/migrations/0098_auto_20200226_1452.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.0.13 on 2020-02-26 14:52 - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0097_auto_20190211_1126"), - ] - - operations = [ - migrations.AlterModelOptions( - name="scenario", - options={}, - ), - migrations.AlterModelOptions( - name="scene", - options={}, - ), - migrations.AlterModelOptions( - name="template", - options={}, - ), - ] diff --git a/delft3dworker/migrations/0099_alter_scene_phase.py b/delft3dworker/migrations/0099_alter_scene_phase.py deleted file mode 100644 index f01a2f5..0000000 --- a/delft3dworker/migrations/0099_alter_scene_phase.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 3.2.4 on 2021-06-21 16:12 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0098_auto_20200226_1452"), - ] - - operations = [ - migrations.AlterField( - model_name="scene", - name="phase", - field=models.PositiveSmallIntegerField( - choices=[ - (0, "New"), - (6, "Idle: waiting for user input"), - (11, "Starting workflow"), - (12, "Running workflow"), - (13, "Removing workflow"), - (20, "Stopping workflow"), - (21, "Removing stopped workflow"), - (500, "Finished"), - (501, "Failed"), - (502, "Stopped"), - ], - default=0, - ), - ), - ] diff --git a/delft3dworker/migrations/0100_alter_scene_options.py b/delft3dworker/migrations/0100_alter_scene_options.py deleted file mode 100644 index 884a0c0..0000000 --- a/delft3dworker/migrations/0100_alter_scene_options.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.4 on 2021-06-23 14:39 - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0099_alter_scene_phase"), - ] - - operations = [ - migrations.AlterModelOptions( - name="scene", - options={ - "permissions": [("extended_view_scene", "Can view scene with actions.")] - }, - ), - ] diff --git a/delft3dworker/migrations/0101_add_restricted_group.py b/delft3dworker/migrations/0101_add_restricted_group.py deleted file mode 100644 index f932f5f..0000000 --- a/delft3dworker/migrations/0101_add_restricted_group.py +++ /dev/null @@ -1,47 +0,0 @@ -from django.db import migrations - -restricted_world_permissions = [ - "view_scenario", - "view_scene", - "view_template", -] - - -def forwards_func(apps, schema_editor): - Group = apps.get_model("auth", "Group") - Permission = apps.get_model("auth", "Permission") - ContentType = apps.get_model("contenttypes", "ContentType") - Scenario = apps.get_model("delft3dworker", "Scenario") - Scene = apps.get_model("delft3dworker", "Scene") - Template = apps.get_model("delft3dworker", "Template") - - db_alias = schema_editor.connection.alias - - restricted_world, _ = Group.objects.using(db_alias).get_or_create( - name="access:world_restricted" - ) - for model, permission_code in zip( - [Scenario, Scene, Template], restricted_world_permissions - ): - content_type = ContentType.objects.get_for_model(model) - print(model, content_type, permission_code) - perm, _ = Permission.objects.using(db_alias).get_or_create( - codename=permission_code, content_type=content_type - ) - restricted_world.permissions.add(perm) - - -def reverse_func(apps, schema_editor): - Group = apps.get_model("auth", "Group") - db_alias = schema_editor.connection.alias - Group.objects.using(db_alias).filter(name="access:world_restricted").delete() - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0100_alter_scene_options"), - ] - - operations = [ - migrations.RunPython(forwards_func, reverse_func), - ] diff --git a/delft3dworker/migrations/0102_add_extended_view_permissions.py b/delft3dworker/migrations/0102_add_extended_view_permissions.py deleted file mode 100644 index 6ae4d05..0000000 --- a/delft3dworker/migrations/0102_add_extended_view_permissions.py +++ /dev/null @@ -1,72 +0,0 @@ -from django.contrib.auth.models import Group -from django.db import migrations -from guardian.shortcuts import ( - assign_perm, - get_groups_with_perms, - get_users_with_perms, - remove_perm, -) - - -def forwards_func(apps, schema_editor): - Scene = apps.get_model("delft3dworker", "Scene") - db_alias = schema_editor.connection.alias - - restricted_world = Group.objects.using(db_alias).get(name="access:world_restricted") - - for scene in Scene.objects.using(db_alias).all(): - # if a user has view permission on a scene, - # the user also has a extended_view - for user, _ in get_users_with_perms( - scene, - attach_perms=True, - with_group_users=False, - only_with_perms_in=("view_scene",), - ).items(): - assign_perm("extended_view_scene", user, scene) - - # if a group has a view permission on a scene, - # the group also has a extended view - for group, permissions in get_groups_with_perms( - scene, attach_perms=True - ).items(): - if "view_scene" in permissions: - assign_perm("extended_view_scene", group, scene) - - # if the world group has a view permission - # we also add view to the restricted world group - if "view_scene" in permissions and group.name == "access:world": - assign_perm("view_scene", restricted_world, scene) - - -def reverse_func(apps, schema_editor): - Scene = apps.get_model("delft3dworker", "Scene") - db_alias = schema_editor.connection.alias - - for scene in Scene.objects.using(db_alias).all(): - for user, _ in get_users_with_perms( - scene, - attach_perms=True, - with_group_users=False, - only_with_perms_in=("extended_view_scene",), - ).items(): - remove_perm("extended_view_scene", user, scene) - - for group, permissions in get_groups_with_perms( - scene, attach_perms=True - ).items(): - if "extended_view_scene" in permissions: - remove_perm("extended_view_scene", group, scene) - - if "view_scene" in permissions and group.name == "access:world_restricted": - remove_perm("view_scene", group, scene) - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0101_add_restricted_group"), - ] - - operations = [ - migrations.RunPython(forwards_func, reverse_func), - ] diff --git a/delft3dworker/migrations/0103_alter_template_yaml_template.py b/delft3dworker/migrations/0103_alter_template_yaml_template.py deleted file mode 100644 index 009778c..0000000 --- a/delft3dworker/migrations/0103_alter_template_yaml_template.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.2.25 on 2024-06-10 17:58 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0102_add_extended_view_permissions"), - ] - - operations = [ - migrations.AlterField( - model_name="template", - name="yaml_template", - field=models.FileField(default="", upload_to="workflow_templates"), - ), - ] diff --git a/delft3dworker/migrations/0104_manual_scene_images_fix.py b/delft3dworker/migrations/0104_manual_scene_images_fix.py deleted file mode 100644 index a07a817..0000000 --- a/delft3dworker/migrations/0104_manual_scene_images_fix.py +++ /dev/null @@ -1,53 +0,0 @@ -from django.db import migrations - - -def forwards_func(apps, schema_editor): - Scene = apps.get_model("delft3dworker", "Scene") - db_alias = schema_editor.connection.alias - - for scene in Scene.objects.using(db_alias).all(): - changed = False - for key, value in scene.info.items(): - if key == "delta_fringe_images": - changed = True - value["name"] = "Delta Fringe" - value[ - "text" - ] = """This graph shows the position of the delta plain fringe superimposed on the graph of the water depth. This is an indicator for the large-scale plan-view morphology of a delta, which is a function of the dominant forcing processes (waves, rivers, tides) and grain size of transported sediments.""" - value["pattern"] = "delta_fringe" - if key == "subenvironment_images": - changed = True - value["name"] = "Subenvironment" - value["text"] = "" - value["pattern"] = "subenvironment" - if key == "channel_network_images": - changed = True - value["name"] = "Channel Network" - value[ - "text" - ] = """These graphs display the properties, the architecture and the evolution of the channel network. Fluvial deposits are targets for hydrocarbon and groundwater exploration as they are typically permeable and continuous, and consequently a potential reservoir or aquifer.""" - value["pattern"] = "channel_network" - if key == "sediment_fraction_images": - changed = True - value["name"] = "Sediment Fraction" - value[ - "text" - ] = """In this cross-shore section the sand fraction of the accumulated sediments and the stratigraphic build-up of the delta are displayed. These are direct outputs from Delft3D. Thanks to these image it is possible to describe the grain size trends (proximal to distal in this case) and the geometry of sediment bodies within the delta, such as shoreface sand wedges and clay drapes. These are are important factors controlling the size and the heterogeneity of a reservoir.""" - value["pattern"] = "sediment_fraction" - - if changed: - scene.save() - - -def reverse_func(apps, schema_editor): - pass - - -class Migration(migrations.Migration): - dependencies = [ - ("delft3dworker", "0103_alter_template_yaml_template"), - ] - - operations = [ - migrations.RunPython(forwards_func, reverse_func), - ] diff --git a/requirements.txt b/requirements.txt index c8c76e3..e6acf4b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,6 @@ django-constance[database]==2.9.* django-filter==23.5 django-admin-rangefilter==0.9.* -django-jsonfield==1.4.* # only for migrations django-guardian==2.4.* django-model-utils==4.3.* djangorestframework==3.14.* diff --git a/worker_requirements.txt b/worker_requirements.txt index f363482..35d306c 100644 --- a/worker_requirements.txt +++ b/worker_requirements.txt @@ -1,6 +1,6 @@ celery==4.4.* # stuck because of once celery-once==3.0.* # 3 years ago ddtrace==2.6.* -Django==3.2.* # LTS +Django==4.2.* # LTS kubernetes==23.* # match cluster 1.23 redis[hiredis]==5.0.*