From 76815db55afc0d2a25a232c2d39d61fced2d2293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guilhem=20Barth=C3=A9s?= Date: Wed, 25 Oct 2023 15:35:23 +0200 Subject: [PATCH] fix: remove rebase artifacts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guilhem Barthés --- .github/workflows/helm.yml | 4 +- .../migrations/0054_alter_function_status.py | 28 -------------- ...015_alter_computetaskfailurereport_logs.py | 25 ------------- .../migrations/0016_add_functionimage.py | 37 ------------------- ..._computetaskfailurereport_logs_and_more.py | 35 ------------------ ...ename_computetaskfailurereport_and_more.py | 29 --------------- ..._alter_assetfailurereport_logs_and_more.py | 26 ------------- 7 files changed, 1 insertion(+), 183 deletions(-) delete mode 100644 backend/api/migrations/0054_alter_function_status.py delete mode 100644 backend/substrapp/migrations/0015_alter_computetaskfailurereport_logs.py delete mode 100644 backend/substrapp/migrations/0016_add_functionimage.py delete mode 100644 backend/substrapp/migrations/0017_alter_computetaskfailurereport_logs_and_more.py delete mode 100644 backend/substrapp/migrations/0018_rename_computetaskfailurereport_and_more.py delete mode 100644 backend/substrapp/migrations/0019_alter_assetfailurereport_logs_and_more.py diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml index 8260c47fe..75cecfe6e 100644 --- a/.github/workflows/helm.yml +++ b/.github/workflows/helm.yml @@ -11,8 +11,6 @@ on: - "main" paths: - "charts/**" - release: - types: [published, edited] concurrency: group: "${{ github.workflow }}-${{ github.ref }}" @@ -87,7 +85,7 @@ jobs: publish: name: Publish runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' && github.event_name == 'push' || github.event_name == 'release' + if: github.ref == 'refs/heads/main' && github.event_name == 'push' needs: - test - generate-chart-readme 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/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/0016_add_functionimage.py b/backend/substrapp/migrations/0016_add_functionimage.py deleted file mode 100644 index 47943c12b..000000000 --- a/backend/substrapp/migrations/0016_add_functionimage.py +++ /dev/null @@ -1,37 +0,0 @@ -# Generated by Django 4.1.7 on 2023-08-11 11:30 - -import django.db.models.deletion -from django.db import migrations -from django.db import models - -import substrapp.models.datamanager -import substrapp.models.function -import substrapp.storages.minio - - -class Migration(migrations.Migration): - dependencies = [ - ("substrapp", "0015_alter_computetaskfailurereport_logs"), - ] - - operations = [ - migrations.CreateModel( - name="FunctionImage", - fields=[ - ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), - ( - "file", - models.FileField( - max_length=500, - storage=substrapp.storages.minio.MinioStorage("substra-function"), - upload_to=substrapp.models.function.upload_to_function, - ), - ), - ("checksum", models.CharField(blank=True, max_length=64)), - ( - "function", - models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to="substrapp.function"), - ), - ], - ), - ] 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/0018_rename_computetaskfailurereport_and_more.py b/backend/substrapp/migrations/0018_rename_computetaskfailurereport_and_more.py deleted file mode 100644 index 6745ecdb0..000000000 --- a/backend/substrapp/migrations/0018_rename_computetaskfailurereport_and_more.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 4.2.3 on 2023-08-30 15:07 - -from django.db import migrations -from django.db import models - - -class Migration(migrations.Migration): - dependencies = [ - ("substrapp", "0017_alter_computetaskfailurereport_logs_and_more"), - ] - - operations = [ - migrations.RenameModel("ComputeTaskFailureReport", "AssetFailureReport"), - migrations.RenameField("AssetFailureReport", "compute_task_key", "asset_key"), - migrations.AddField( - model_name="assetfailurereport", - name="asset_type", - field=models.CharField( - choices=[ - ("FAILED_ASSET_UNKNOWN", "Failed Asset Unknown"), - ("FAILED_ASSET_COMPUTE_TASK", "Failed Asset Compute Task"), - ("FAILED_ASSET_FUNCTION", "Failed Asset Function"), - ], - default="FAILED_ASSET_UNKNOWN", - max_length=100, - ), - preserve_default=False, - ), - ] 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, - ), - ), - ]