From 1b9744016b6fb69f93e4b1668c3b8c0103dac0ed Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 25 Nov 2025 22:45:34 +0000 Subject: [PATCH] Adjust migration dependencies --- .../0040_parametertemplate_parameter.py | 1 + .../migrations/0041_auto_20251028_1112.py | 32 +++++++++++-------- ..._partcategoryparametertemplate_template.py | 2 +- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/backend/InvenTree/common/migrations/0040_parametertemplate_parameter.py b/src/backend/InvenTree/common/migrations/0040_parametertemplate_parameter.py index 23a18a3ca2..c751861b33 100644 --- a/src/backend/InvenTree/common/migrations/0040_parametertemplate_parameter.py +++ b/src/backend/InvenTree/common/migrations/0040_parametertemplate_parameter.py @@ -13,6 +13,7 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("common", "0039_emailthread_emailmessage"), + ("part", "0143_alter_part_image") ] operations = [ diff --git a/src/backend/InvenTree/common/migrations/0041_auto_20251028_1112.py b/src/backend/InvenTree/common/migrations/0041_auto_20251028_1112.py index 54a6f42d10..5a53119e45 100644 --- a/src/backend/InvenTree/common/migrations/0041_auto_20251028_1112.py +++ b/src/backend/InvenTree/common/migrations/0041_auto_20251028_1112.py @@ -1,7 +1,12 @@ # Generated by Django 4.2.25 on 2025-10-28 11:12 +import structlog + from django.db import migrations +logger = structlog.get_logger('inventree') + + def convert_to_numeric_value(value: str, units: str): """Convert a value (with units) to a numeric value. @@ -43,9 +48,9 @@ def update_global_setting(apps, schema_editor): GlobalSetting.objects.filter(key=NEW_KEY).delete() setting.key = NEW_KEY setting.save() - print(f"Updated global setting key from {OLD_KEY} to {NEW_KEY}.") + logger.info(f"Updated global setting key from {OLD_KEY} to {NEW_KEY}.") except GlobalSetting.DoesNotExist: - print(f"Global setting {OLD_KEY} does not exist; no update needed.") + logger.info(f"Global setting {OLD_KEY} does not exist; no update needed.") def remove_existing_parameters(apps, schema_editor): @@ -61,10 +66,10 @@ def remove_existing_parameters(apps, schema_editor): ParameterTemplate.objects.all().delete() if n_params > 0: - print(f"Removed {n_params} existing Parameter instances.") + logger.info(f"Removed {n_params} existing Parameter instances.") if n_templates > 0: - print(f"Removed {n_templates} existing ParameterTemplate instances.") + logger.info(f"Removed {n_templates} existing ParameterTemplate instances.") assert Parameter.objects.count() == 0 assert ParameterTemplate.objects.count() == 0 @@ -95,14 +100,14 @@ def copy_part_parameters(apps, schema_editor): if len(templates) > 0: ParameterTemplate.objects.bulk_create(templates) - print(f"\nMigrated {len(templates)} PartParameterTemplate instances.") + logger.info(f"\nMigrated {len(templates)} PartParameterTemplate instances.") assert ParameterTemplate.objects.all().count() == len(templates) # Next, copy PartParameter instances to Parameter instances parameters = [] - content_type = ContentType.objects.get_or_create(app_label='part', model='part') + content_type, _created = ContentType.objects.get_or_create(app_label='part', model='part') for parameter in PartParameter.objects.all(): # Find the corresponding ParameterTemplate @@ -122,9 +127,9 @@ def copy_part_parameters(apps, schema_editor): if len(parameters) > 0: Parameter.objects.bulk_create(parameters) - print(f"\nMigrated {len(parameters)} PartParameter instances.") + logger.info(f"\nMigrated {len(parameters)} PartParameter instances.") - assert Parameter.objects.filter(model_type=content_type.id).count() == len(parameters) + assert Parameter.objects.filter(model_type=content_type).count() == len(parameters) def copy_manufacturer_part_parameters(apps, schema_editor): @@ -136,7 +141,7 @@ def copy_manufacturer_part_parameters(apps, schema_editor): ContentType = apps.get_model("contenttypes", "ContentType") parameters = [] - content_type = ContentType.objects.get_or_create(app_label='company', model='manufacturerpart') + content_type, _created = ContentType.objects.get_or_create(app_label='company', model='manufacturerpart') for parameter in ManufacturerPartParameter.objects.all(): # Find the corresponding ParameterTemplate @@ -163,9 +168,9 @@ def copy_manufacturer_part_parameters(apps, schema_editor): if len(parameters) > 0: Parameter.objects.bulk_create(parameters) - print(f"\nMigrated {len(parameters)} ManufacturerPartParameter instances.") + logger.info(f"\nMigrated {len(parameters)} ManufacturerPartParameter instances.") - assert Parameter.objects.filter(model_type=content_type.id).count() == len(parameters) + assert Parameter.objects.filter(model_type=content_type).count() == len(parameters) def update_category_parameters(apps, schema_editor): @@ -189,17 +194,16 @@ def update_category_parameters(apps, schema_editor): if len(to_update) > 0: PartCategoryParameterTemplate.objects.bulk_update(to_update, ['template']) - print(f"Updated {len(to_update)} PartCategoryParameterTemplate instances.") + logger.info(f"Updated {len(to_update)} PartCategoryParameterTemplate instances.") class Migration(migrations.Migration): dependencies = [ ('contenttypes', '__latest__'), - ("part", "0132_partparametertemplate_selectionlist"), + ("part", "0144_partcategoryparametertemplate_template"), ("company", "0034_manufacturerpart"), ("common", "0040_parametertemplate_parameter"), - ("part", "0144_partcategoryparametertemplate_template") ] operations = [ diff --git a/src/backend/InvenTree/part/migrations/0144_partcategoryparametertemplate_template.py b/src/backend/InvenTree/part/migrations/0144_partcategoryparametertemplate_template.py index ad889bbda9..bc627b0dd7 100644 --- a/src/backend/InvenTree/part/migrations/0144_partcategoryparametertemplate_template.py +++ b/src/backend/InvenTree/part/migrations/0144_partcategoryparametertemplate_template.py @@ -7,8 +7,8 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ("common", "0040_parametertemplate_parameter"), ("part", "0143_alter_part_image"), + ("common", "0040_parametertemplate_parameter"), ] operations = [