From b21d5fcc562a5482db54ec1e0a0aaff089df9f3a Mon Sep 17 00:00:00 2001 From: SdgJlbl Date: Mon, 23 Oct 2023 12:01:01 +0200 Subject: [PATCH] chore: rationalize migrations Signed-off-by: SdgJlbl --- .../api/migrations/0053_function_status.py | 2 +- .../migrations/0054_alter_function_status.py | 28 --------------- ...tionimage.py => 0015_add_functionimage.py} | 5 ++- ...015_alter_computetaskfailurereport_logs.py | 25 ------------- ...name_computetaskfailurereport_and_more.py} | 2 +- ..._computetaskfailurereport_logs_and_more.py | 35 ------------------- ..._alter_assetfailurereport_logs_and_more.py | 26 -------------- 7 files changed, 4 insertions(+), 119 deletions(-) delete mode 100644 backend/api/migrations/0054_alter_function_status.py rename backend/substrapp/migrations/{0016_add_functionimage.py => 0015_add_functionimage.py} (84%) delete mode 100644 backend/substrapp/migrations/0015_alter_computetaskfailurereport_logs.py rename backend/substrapp/migrations/{0018_rename_computetaskfailurereport_and_more.py => 0016_rename_computetaskfailurereport_and_more.py} (92%) delete mode 100644 backend/substrapp/migrations/0017_alter_computetaskfailurereport_logs_and_more.py delete mode 100644 backend/substrapp/migrations/0019_alter_assetfailurereport_logs_and_more.py diff --git a/backend/api/migrations/0053_function_status.py b/backend/api/migrations/0053_function_status.py index 268cc522e..ac554829d 100644 --- a/backend/api/migrations/0053_function_status.py +++ b/backend/api/migrations/0053_function_status.py @@ -16,7 +16,7 @@ class Migration(migrations.Migration): field=models.CharField( choices=[ ("FUNCTION_STATUS_UNKNOWN", "Function Status Unknown"), - ("FUNCTION_STATUS_CREATED", "Function Status Created"), + ("FUNCTION_STATUS_WAITING", "Function Status Waiting"), ("FUNCTION_STATUS_BUILDING", "Function Status Building"), ("FUNCTION_STATUS_READY", "Function Status Ready"), ("FUNCTION_STATUS_CANCELED", "Function Status Canceled"), diff --git a/backend/api/migrations/0054_alter_function_status.py b/backend/api/migrations/0054_alter_function_status.py deleted file mode 100644 index 1bdab7e11..000000000 --- a/backend/api/migrations/0054_alter_function_status.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 4.2.3 on 2023-09-27 16:09 - -from django.db import migrations -from django.db import models - - -class Migration(migrations.Migration): - dependencies = [ - ("api", "0053_function_status"), - ] - - operations = [ - migrations.AlterField( - model_name="function", - name="status", - field=models.CharField( - choices=[ - ("FUNCTION_STATUS_UNKNOWN", "Function Status Unknown"), - ("FUNCTION_STATUS_WAITING", "Function Status Waiting"), - ("FUNCTION_STATUS_BUILDING", "Function Status Building"), - ("FUNCTION_STATUS_READY", "Function Status Ready"), - ("FUNCTION_STATUS_CANCELED", "Function Status Canceled"), - ("FUNCTION_STATUS_FAILED", "Function Status Failed"), - ], - max_length=64, - ), - ), - ] diff --git a/backend/substrapp/migrations/0016_add_functionimage.py b/backend/substrapp/migrations/0015_add_functionimage.py similarity index 84% rename from backend/substrapp/migrations/0016_add_functionimage.py rename to backend/substrapp/migrations/0015_add_functionimage.py index 47943c12b..02d53ad2c 100644 --- a/backend/substrapp/migrations/0016_add_functionimage.py +++ b/backend/substrapp/migrations/0015_add_functionimage.py @@ -6,12 +6,11 @@ import substrapp.models.datamanager import substrapp.models.function -import substrapp.storages.minio class Migration(migrations.Migration): dependencies = [ - ("substrapp", "0015_alter_computetaskfailurereport_logs"), + ("substrapp", "0014_rename_algo_to_function"), ] operations = [ @@ -23,7 +22,7 @@ class Migration(migrations.Migration): "file", models.FileField( max_length=500, - storage=substrapp.storages.minio.MinioStorage("substra-function"), + storage=django.core.files.storage.FileSystemStorage(), upload_to=substrapp.models.function.upload_to_function, ), ), diff --git a/backend/substrapp/migrations/0015_alter_computetaskfailurereport_logs.py b/backend/substrapp/migrations/0015_alter_computetaskfailurereport_logs.py deleted file mode 100644 index b53457814..000000000 --- a/backend/substrapp/migrations/0015_alter_computetaskfailurereport_logs.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 4.1.7 on 2023-08-10 08:43 - -from django.db import migrations -from django.db import models - -import substrapp.models.asset_failure_report -import substrapp.storages.minio - - -class Migration(migrations.Migration): - dependencies = [ - ("substrapp", "0014_rename_algo_to_function"), - ] - - operations = [ - migrations.AlterField( - model_name="computetaskfailurereport", - name="logs", - field=models.FileField( - max_length=36, - storage=substrapp.storages.minio.MinioStorage("substra-compute-task-logs"), - upload_to=substrapp.models.asset_failure_report._upload_to, - ), - ), - ] diff --git a/backend/substrapp/migrations/0018_rename_computetaskfailurereport_and_more.py b/backend/substrapp/migrations/0016_rename_computetaskfailurereport_and_more.py similarity index 92% rename from backend/substrapp/migrations/0018_rename_computetaskfailurereport_and_more.py rename to backend/substrapp/migrations/0016_rename_computetaskfailurereport_and_more.py index 6745ecdb0..e1bccdd36 100644 --- a/backend/substrapp/migrations/0018_rename_computetaskfailurereport_and_more.py +++ b/backend/substrapp/migrations/0016_rename_computetaskfailurereport_and_more.py @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ("substrapp", "0017_alter_computetaskfailurereport_logs_and_more"), + ("substrapp", "0015_add_functionimage"), ] operations = [ diff --git a/backend/substrapp/migrations/0017_alter_computetaskfailurereport_logs_and_more.py b/backend/substrapp/migrations/0017_alter_computetaskfailurereport_logs_and_more.py deleted file mode 100644 index 48977d179..000000000 --- a/backend/substrapp/migrations/0017_alter_computetaskfailurereport_logs_and_more.py +++ /dev/null @@ -1,35 +0,0 @@ -# Generated by Django 4.2.3 on 2023-09-07 07:31 - -import django.core.files.storage -from django.db import migrations -from django.db import models - -import substrapp.models.asset_failure_report -import substrapp.models.function - - -class Migration(migrations.Migration): - dependencies = [ - ("substrapp", "0016_add_functionimage"), - ] - - operations = [ - migrations.AlterField( - model_name="computetaskfailurereport", - name="logs", - field=models.FileField( - max_length=36, - storage=django.core.files.storage.FileSystemStorage(), - upload_to=substrapp.models.asset_failure_report._upload_to, - ), - ), - migrations.AlterField( - model_name="functionimage", - name="file", - field=models.FileField( - max_length=500, - storage=django.core.files.storage.FileSystemStorage(), - upload_to=substrapp.models.function.upload_to_function, - ), - ), - ] diff --git a/backend/substrapp/migrations/0019_alter_assetfailurereport_logs_and_more.py b/backend/substrapp/migrations/0019_alter_assetfailurereport_logs_and_more.py deleted file mode 100644 index 68c284b9d..000000000 --- a/backend/substrapp/migrations/0019_alter_assetfailurereport_logs_and_more.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 4.2.3 on 2023-09-06 15:58 - -import django.core.files.storage -from django.db import migrations -from django.db import models - -import substrapp.models.asset_failure_report -import substrapp.models.function - - -class Migration(migrations.Migration): - dependencies = [ - ("substrapp", "0018_rename_computetaskfailurereport_and_more"), - ] - - operations = [ - migrations.AlterField( - model_name="assetfailurereport", - name="logs", - field=models.FileField( - max_length=36, - storage=django.core.files.storage.FileSystemStorage(), - upload_to=substrapp.models.asset_failure_report._upload_to, - ), - ), - ]