diff --git a/awx/main/migrations/0006_v300_active_flag_cleanup.py b/awx/main/migrations/0006_v300_active_flag_cleanup.py new file mode 100644 index 0000000000..59dee6c3da --- /dev/null +++ b/awx/main/migrations/0006_v300_active_flag_cleanup.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from awx.main.migrations import _cleanup_deleted as cleanup_deleted +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0005_v300_migrate_facts'), + ] + + operations = [ + migrations.RunPython(cleanup_deleted.cleanup_deleted), + ] diff --git a/awx/main/migrations/0006_v300_active_flag_removal.py b/awx/main/migrations/0007_v300_active_flag_removal.py similarity index 89% rename from awx/main/migrations/0006_v300_active_flag_removal.py rename to awx/main/migrations/0007_v300_active_flag_removal.py index 9f2dfb6534..888b63d85f 100644 --- a/awx/main/migrations/0006_v300_active_flag_removal.py +++ b/awx/main/migrations/0007_v300_active_flag_removal.py @@ -1,19 +1,16 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from awx.main.migrations import _cleanup_deleted as cleanup_deleted from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('main', '0005_v300_migrate_facts'), + ('main', '0006_v300_active_flag_cleanup'), ] operations = [ - migrations.RunPython(cleanup_deleted.cleanup_deleted), - migrations.RemoveField( model_name='credential', name='active', diff --git a/awx/main/migrations/0007_v300_rbac_changes.py b/awx/main/migrations/0008_v300_rbac_changes.py similarity index 99% rename from awx/main/migrations/0007_v300_rbac_changes.py rename to awx/main/migrations/0008_v300_rbac_changes.py index cfe8432da9..759b362ba2 100644 --- a/awx/main/migrations/0007_v300_rbac_changes.py +++ b/awx/main/migrations/0008_v300_rbac_changes.py @@ -14,7 +14,7 @@ class Migration(migrations.Migration): ('taggit', '0002_auto_20150616_2121'), ('contenttypes', '0002_remove_content_type_name'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('main', '0006_v300_active_flag_removal'), + ('main', '0007_v300_active_flag_removal'), ] operations = [ diff --git a/awx/main/migrations/0008_v300_rbac_migrations.py b/awx/main/migrations/0009_v300_rbac_migrations.py similarity index 92% rename from awx/main/migrations/0008_v300_rbac_migrations.py rename to awx/main/migrations/0009_v300_rbac_migrations.py index db0f197e8d..b652c1067a 100644 --- a/awx/main/migrations/0008_v300_rbac_migrations.py +++ b/awx/main/migrations/0009_v300_rbac_migrations.py @@ -8,7 +8,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('main', '0007_v300_rbac_changes'), + ('main', '0008_v300_rbac_changes'), ] operations = [ diff --git a/awx/main/migrations/0009_v300_create_system_job_templates.py b/awx/main/migrations/0010_v300_create_system_job_templates.py similarity index 98% rename from awx/main/migrations/0009_v300_create_system_job_templates.py rename to awx/main/migrations/0010_v300_create_system_job_templates.py index b95fac8079..665b967ff3 100644 --- a/awx/main/migrations/0009_v300_create_system_job_templates.py +++ b/awx/main/migrations/0010_v300_create_system_job_templates.py @@ -107,7 +107,7 @@ def create_system_job_templates(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('main', '0008_v300_rbac_migrations'), + ('main', '0009_v300_rbac_migrations'), ] operations = [ diff --git a/awx/main/migrations/0010_v300_credential_domain_field.py b/awx/main/migrations/0011_v300_credential_domain_field.py similarity index 88% rename from awx/main/migrations/0010_v300_credential_domain_field.py rename to awx/main/migrations/0011_v300_credential_domain_field.py index fc77d9999e..7b8aa0fa49 100644 --- a/awx/main/migrations/0010_v300_credential_domain_field.py +++ b/awx/main/migrations/0011_v300_credential_domain_field.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0009_v300_create_system_job_templates'), + ('main', '0010_v300_create_system_job_templates'), ] operations = [ diff --git a/awx/main/migrations/0011_v300_create_labels.py b/awx/main/migrations/0012_v300_create_labels.py similarity index 97% rename from awx/main/migrations/0011_v300_create_labels.py rename to awx/main/migrations/0012_v300_create_labels.py index 77c58b0139..ae1b9df932 100644 --- a/awx/main/migrations/0011_v300_create_labels.py +++ b/awx/main/migrations/0012_v300_create_labels.py @@ -12,7 +12,7 @@ class Migration(migrations.Migration): dependencies = [ ('taggit', '0002_auto_20150616_2121'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('main', '0010_v300_credential_domain_field'), + ('main', '0011_v300_credential_domain_field'), ] operations = [