From 434b0f1f25fb0fff99f6d366ee60d31f85cfb817 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Tue, 13 Dec 2016 14:42:24 -0500 Subject: [PATCH] remove unneeded data migrations from squashed migrations --- awx/main/migrations/0002_squashed_v300_release.py | 3 --- awx/main/migrations/0003_squashed_v300_v303_updates.py | 6 ------ 2 files changed, 9 deletions(-) diff --git a/awx/main/migrations/0002_squashed_v300_release.py b/awx/main/migrations/0002_squashed_v300_release.py index c2244f69eb..c398d18468 100644 --- a/awx/main/migrations/0002_squashed_v300_release.py +++ b/awx/main/migrations/0002_squashed_v300_release.py @@ -6,7 +6,6 @@ from __future__ import unicode_literals import awx.main.fields -from awx.main.migrations import _cleanup_deleted as cleanup_deleted from django.db import migrations, models import django.db.models.deletion @@ -248,8 +247,6 @@ class Migration(migrations.Migration): name='fact', index_together=set([('timestamp', 'module', 'host')]), ), - # Active flag cleanup - migrations.RunPython(cleanup_deleted.cleanup_deleted), # Active flag removal migrations.RemoveField( model_name='credential', diff --git a/awx/main/migrations/0003_squashed_v300_v303_updates.py b/awx/main/migrations/0003_squashed_v300_v303_updates.py index 837a9e75ee..82d781ec85 100644 --- a/awx/main/migrations/0003_squashed_v300_v303_updates.py +++ b/awx/main/migrations/0003_squashed_v300_v303_updates.py @@ -5,9 +5,6 @@ from __future__ import unicode_literals -from awx.main.migrations import _migration_utils as migration_utils -from awx.main.migrations import _save_password_keys - from django.db import migrations, models from django.conf import settings import awx.main.fields @@ -44,7 +41,6 @@ class Migration(migrations.Migration): ] operations = [ - migrations.RunPython(migration_utils.set_current_apps_for_migrations), # Labels Changes migrations.RemoveField( model_name='job', @@ -146,7 +142,6 @@ class Migration(migrations.Migration): name='survey_passwords', field=jsonfield.fields.JSONField(default={}, editable=False, blank=True), ), - migrations.RunPython(_save_password_keys.migrate_survey_passwords), # RBAC credential permission updates migrations.AlterField( model_name='credential', @@ -158,5 +153,4 @@ class Migration(migrations.Migration): name='use_role', field=awx.main.fields.ImplicitRoleField(related_name='+', parent_role=[b'admin_role'], to='main.Role', null=b'True'), ), - migrations.RunPython(update_dashed_host_variables), ]