From 44470200a2c15634bf9d166972af402fbc3272ac Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Mon, 23 Apr 2018 07:51:36 -0400 Subject: [PATCH] Fix migration numbering --- ...ar.py => 0025_v330_add_oauth_activity_stream_registrar.py} | 0 ...v330_delete_authtoken.py => 0026_v330_delete_authtoken.py} | 2 +- ...026_v330_emitted_events.py => 0027_v330_emitted_events.py} | 2 +- ...v330_add_tower_verify.py => 0028_v330_add_tower_verify.py} | 2 +- ...rs_can_see_teams.py => 0029_v330_members_can_see_teams.py} | 2 +- ..._modify_application.py => 0030_v330_modify_application.py} | 2 +- ...pt_oauth2_secret.py => 0031_v330_encrypt_oauth2_secret.py} | 2 +- ..._polymorphic_delete.py => 0032_v330_polymorphic_delete.py} | 2 +- ...1_v330_oauth_help_text.py => 0033_v330_oauth_help_text.py} | 4 ++-- ...v330_delete_user_role.py => 0034_v330_delete_user_role.py} | 4 ++-- ...oauth2_help_text.py => 0035_v330_more_oauth2_help_text.py} | 2 +- awx/network_ui/migrations/0001_initial.py | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) rename awx/main/migrations/{0024_v330_add_oauth_activity_stream_registrar.py => 0025_v330_add_oauth_activity_stream_registrar.py} (100%) rename awx/main/migrations/{0025_v330_delete_authtoken.py => 0026_v330_delete_authtoken.py} (90%) rename awx/main/migrations/{0026_v330_emitted_events.py => 0027_v330_emitted_events.py} (90%) rename awx/main/migrations/{0027_v330_add_tower_verify.py => 0028_v330_add_tower_verify.py} (88%) rename awx/main/migrations/{0028_v330_members_can_see_teams.py => 0029_v330_members_can_see_teams.py} (95%) rename awx/main/migrations/{0028_v330_modify_application.py => 0030_v330_modify_application.py} (92%) rename awx/main/migrations/{0029_v330_encrypt_oauth2_secret.py => 0031_v330_encrypt_oauth2_secret.py} (92%) rename awx/main/migrations/{0030_v330_polymorphic_delete.py => 0032_v330_polymorphic_delete.py} (91%) rename awx/main/migrations/{0031_v330_oauth_help_text.py => 0033_v330_oauth_help_text.py} (97%) rename awx/main/migrations/{0032_v330_delete_user_role.py => 0034_v330_delete_user_role.py} (92%) rename awx/main/migrations/{0034_v330_more_oauth2_help_text.py => 0035_v330_more_oauth2_help_text.py} (93%) diff --git a/awx/main/migrations/0024_v330_add_oauth_activity_stream_registrar.py b/awx/main/migrations/0025_v330_add_oauth_activity_stream_registrar.py similarity index 100% rename from awx/main/migrations/0024_v330_add_oauth_activity_stream_registrar.py rename to awx/main/migrations/0025_v330_add_oauth_activity_stream_registrar.py diff --git a/awx/main/migrations/0025_v330_delete_authtoken.py b/awx/main/migrations/0026_v330_delete_authtoken.py similarity index 90% rename from awx/main/migrations/0025_v330_delete_authtoken.py rename to awx/main/migrations/0026_v330_delete_authtoken.py index 237473c60f..c1a8fe19d4 100644 --- a/awx/main/migrations/0025_v330_delete_authtoken.py +++ b/awx/main/migrations/0026_v330_delete_authtoken.py @@ -12,7 +12,7 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('main', '0024_v330_add_oauth_activity_stream_registrar'), + ('main', '0025_v330_add_oauth_activity_stream_registrar'), ] operations = [ diff --git a/awx/main/migrations/0026_v330_emitted_events.py b/awx/main/migrations/0027_v330_emitted_events.py similarity index 90% rename from awx/main/migrations/0026_v330_emitted_events.py rename to awx/main/migrations/0027_v330_emitted_events.py index cfd995c751..5c87239cd3 100644 --- a/awx/main/migrations/0026_v330_emitted_events.py +++ b/awx/main/migrations/0027_v330_emitted_events.py @@ -8,7 +8,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0025_v330_delete_authtoken'), + ('main', '0026_v330_delete_authtoken'), ] operations = [ diff --git a/awx/main/migrations/0027_v330_add_tower_verify.py b/awx/main/migrations/0028_v330_add_tower_verify.py similarity index 88% rename from awx/main/migrations/0027_v330_add_tower_verify.py rename to awx/main/migrations/0028_v330_add_tower_verify.py index 7ec04d2745..5fd671cde5 100644 --- a/awx/main/migrations/0027_v330_add_tower_verify.py +++ b/awx/main/migrations/0028_v330_add_tower_verify.py @@ -10,7 +10,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0026_v330_emitted_events'), + ('main', '0027_v330_emitted_events'), ] operations = [ diff --git a/awx/main/migrations/0028_v330_members_can_see_teams.py b/awx/main/migrations/0029_v330_members_can_see_teams.py similarity index 95% rename from awx/main/migrations/0028_v330_members_can_see_teams.py rename to awx/main/migrations/0029_v330_members_can_see_teams.py index 7d461c40dc..a314bda418 100644 --- a/awx/main/migrations/0028_v330_members_can_see_teams.py +++ b/awx/main/migrations/0029_v330_members_can_see_teams.py @@ -17,7 +17,7 @@ from awx.main.migrations import _migration_utils as migration_utils class Migration(ActivityStreamDisabledMigration): dependencies = [ - ('main', '0027_v330_add_tower_verify'), + ('main', '0028_v330_add_tower_verify'), ] operations = [ diff --git a/awx/main/migrations/0028_v330_modify_application.py b/awx/main/migrations/0030_v330_modify_application.py similarity index 92% rename from awx/main/migrations/0028_v330_modify_application.py rename to awx/main/migrations/0030_v330_modify_application.py index a54a3a9527..54d190292b 100644 --- a/awx/main/migrations/0028_v330_modify_application.py +++ b/awx/main/migrations/0030_v330_modify_application.py @@ -11,7 +11,7 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('main', '0027_v330_add_tower_verify'), + ('main', '0029_v330_members_can_see_teams'), ] operations = [ diff --git a/awx/main/migrations/0029_v330_encrypt_oauth2_secret.py b/awx/main/migrations/0031_v330_encrypt_oauth2_secret.py similarity index 92% rename from awx/main/migrations/0029_v330_encrypt_oauth2_secret.py rename to awx/main/migrations/0031_v330_encrypt_oauth2_secret.py index e49372144b..4bb993f423 100644 --- a/awx/main/migrations/0029_v330_encrypt_oauth2_secret.py +++ b/awx/main/migrations/0031_v330_encrypt_oauth2_secret.py @@ -10,7 +10,7 @@ import oauth2_provider.generators class Migration(migrations.Migration): dependencies = [ - ('main', '0028_v330_modify_application'), + ('main', '0030_v330_modify_application'), ] operations = [ diff --git a/awx/main/migrations/0030_v330_polymorphic_delete.py b/awx/main/migrations/0032_v330_polymorphic_delete.py similarity index 91% rename from awx/main/migrations/0030_v330_polymorphic_delete.py rename to awx/main/migrations/0032_v330_polymorphic_delete.py index ad041718ee..dd3d6a769f 100644 --- a/awx/main/migrations/0030_v330_polymorphic_delete.py +++ b/awx/main/migrations/0032_v330_polymorphic_delete.py @@ -9,7 +9,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0029_v330_encrypt_oauth2_secret'), + ('main', '0031_v330_encrypt_oauth2_secret'), ] operations = [ diff --git a/awx/main/migrations/0031_v330_oauth_help_text.py b/awx/main/migrations/0033_v330_oauth_help_text.py similarity index 97% rename from awx/main/migrations/0031_v330_oauth_help_text.py rename to awx/main/migrations/0033_v330_oauth_help_text.py index 86f7e2a86e..41704307b0 100644 --- a/awx/main/migrations/0031_v330_oauth_help_text.py +++ b/awx/main/migrations/0033_v330_oauth_help_text.py @@ -13,9 +13,9 @@ import oauth2_provider.generators class Migration(migrations.Migration): dependencies = [ - ('main', '0030_v330_polymorphic_delete'), + ('main', '0032_v330_polymorphic_delete'), ] - + operations = [ migrations.AlterField( model_name='oauth2accesstoken', diff --git a/awx/main/migrations/0032_v330_delete_user_role.py b/awx/main/migrations/0034_v330_delete_user_role.py similarity index 92% rename from awx/main/migrations/0032_v330_delete_user_role.py rename to awx/main/migrations/0034_v330_delete_user_role.py index f9cb6ce09b..6719e307ca 100644 --- a/awx/main/migrations/0032_v330_delete_user_role.py +++ b/awx/main/migrations/0034_v330_delete_user_role.py @@ -12,11 +12,11 @@ from awx.main.migrations import _migration_utils as migration_utils class Migration(ActivityStreamDisabledMigration): dependencies = [ - ('main', '0031_v330_oauth_help_text'), + ('main', '0033_v330_oauth_help_text'), ] operations = [ migrations.RunPython(migration_utils.set_current_apps_for_migrations), migrations.RunPython(delete_all_user_roles), migrations.RunPython(rebuild_role_hierarchy), - ] \ No newline at end of file + ] diff --git a/awx/main/migrations/0034_v330_more_oauth2_help_text.py b/awx/main/migrations/0035_v330_more_oauth2_help_text.py similarity index 93% rename from awx/main/migrations/0034_v330_more_oauth2_help_text.py rename to awx/main/migrations/0035_v330_more_oauth2_help_text.py index 7dc6f222ef..95671c4f44 100644 --- a/awx/main/migrations/0034_v330_more_oauth2_help_text.py +++ b/awx/main/migrations/0035_v330_more_oauth2_help_text.py @@ -9,7 +9,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0032_v330_delete_user_role'), + ('main', '0034_v330_delete_user_role'), ] operations = [ diff --git a/awx/network_ui/migrations/0001_initial.py b/awx/network_ui/migrations/0001_initial.py index 9b81e82455..07013104e1 100644 --- a/awx/network_ui/migrations/0001_initial.py +++ b/awx/network_ui/migrations/0001_initial.py @@ -11,7 +11,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('main', '0026_v330_emitted_events'), + ('main', '0027_v330_emitted_events'), ] operations = [