diff --git a/netbox/core/apps.py b/netbox/core/apps.py index ffcf0b4ea..2d999c57e 100644 --- a/netbox/core/apps.py +++ b/netbox/core/apps.py @@ -1,4 +1,15 @@ from django.apps import AppConfig +from django.db import models +from django.db.migrations.operations import AlterModelOptions + +from utilities.migration import custom_deconstruct + +# Ignore verbose_name & verbose_name_plural Meta options when calculating model migrations +AlterModelOptions.ALTER_OPTION_KEYS.remove('verbose_name') +AlterModelOptions.ALTER_OPTION_KEYS.remove('verbose_name_plural') + +# Use our custom destructor to ignore certain attributes when calculating field migrations +models.Field.deconstruct = custom_deconstruct class CoreConfig(AppConfig): diff --git a/netbox/core/management/commands/makemigrations.py b/netbox/core/management/commands/makemigrations.py index 10874418a..ce40bd3cc 100644 --- a/netbox/core/management/commands/makemigrations.py +++ b/netbox/core/management/commands/makemigrations.py @@ -1,18 +1,6 @@ -# noinspection PyUnresolvedReferences from django.conf import settings from django.core.management.base import CommandError from django.core.management.commands.makemigrations import Command as _Command -from django.db import models -from django.db.migrations.operations import AlterModelOptions - -from utilities.migration import custom_deconstruct - -# Monkey patch AlterModelOptions to ignore verbose name attributes -AlterModelOptions.ALTER_OPTION_KEYS.remove('verbose_name') -AlterModelOptions.ALTER_OPTION_KEYS.remove('verbose_name_plural') - -# Set our custom deconstructor for fields -models.Field.deconstruct = custom_deconstruct class Command(_Command): diff --git a/netbox/core/management/commands/migrate.py b/netbox/core/management/commands/migrate.py deleted file mode 100644 index 8d5e45a40..000000000 --- a/netbox/core/management/commands/migrate.py +++ /dev/null @@ -1,7 +0,0 @@ -# noinspection PyUnresolvedReferences -from django.core.management.commands.migrate import Command -from django.db import models - -from utilities.migration import custom_deconstruct - -models.Field.deconstruct = custom_deconstruct