diff options
| author |  Sebastiaan Zeeff <[email protected]> | 2019-10-18 12:52:11 +0200 |
|---|---|---|
| committer | Sebastiaan Zeeff <[email protected]> | 2019-10-18 12:52:11 +0200 |
| commit | e415428386caae19aa0398aea66ee5053569abcf (patch) | |
| tree | aa3caca500f85cfc8ef5a5e10147a6d3e30fe699 /pydis_site | |
| parent | Merge branch 'master' into active-infractions-validation (diff) | |
Solve migration conflict by renaming migrations
The migration files were generated and named before the migrations
added by other pull requests. This caused the migration path to
diverge. Since the migrations did not touch the same models, the
solution was to rename the migration files to place them at the end
of the migration history.
Diffstat (limited to 'pydis_site')
| -rw-r--r-- | pydis_site/apps/api/migrations/0046_active_infractions_migration.py (renamed from pydis_site/apps/api/migrations/0044_active_infractions_migration.py) | 2 | ||||
| -rw-r--r-- | pydis_site/apps/api/migrations/0047_add_infractions_unique_constraints_active.py (renamed from pydis_site/apps/api/migrations/0045_add_infractions_unique_constraints_active.py) | 2 | ||||
| -rw-r--r-- | pydis_site/apps/api/tests/migrations/test_active_infraction_migration.py | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pydis_site/apps/api/migrations/0044_active_infractions_migration.py b/pydis_site/apps/api/migrations/0046_active_infractions_migration.py index 14746712..7e5a631c 100644 --- a/pydis_site/apps/api/migrations/0044_active_infractions_migration.py +++ b/pydis_site/apps/api/migrations/0046_active_infractions_migration.py @@ -97,7 +97,7 @@ class Migration(migrations.Migration): """Data migration to get the database consistent with the new infraction validation rules.""" dependencies = [ - ('api', '0043_infraction_hidden_warnings_to_notes'), + ('api', '0045_add_plural_name_for_log_entry'), ] operations = [ diff --git a/pydis_site/apps/api/migrations/0045_add_infractions_unique_constraints_active.py b/pydis_site/apps/api/migrations/0047_add_infractions_unique_constraints_active.py index bacb56b8..dc266474 100644 --- a/pydis_site/apps/api/migrations/0045_add_infractions_unique_constraints_active.py +++ b/pydis_site/apps/api/migrations/0047_add_infractions_unique_constraints_active.py @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('api', '0044_active_infractions_migration'), + ('api', '0046_active_infractions_migration'), ] operations = [ diff --git a/pydis_site/apps/api/tests/migrations/test_active_infraction_migration.py b/pydis_site/apps/api/tests/migrations/test_active_infraction_migration.py index cfae4219..61574b7e 100644 --- a/pydis_site/apps/api/tests/migrations/test_active_infraction_migration.py +++ b/pydis_site/apps/api/tests/migrations/test_active_infraction_migration.py @@ -81,8 +81,8 @@ class InfractionFactoryTests(MigrationsTestCase): """Tests for the InfractionFactory.""" app = "api" - migration_prior = "0043_infraction_hidden_warnings_to_notes" - migration_target = "0043_infraction_hidden_warnings_to_notes" + migration_prior = "0045_add_plural_name_for_log_entry" + migration_target = "0045_add_plural_name_for_log_entry" @classmethod def setUpPostMigrationData(cls, apps): @@ -183,8 +183,8 @@ class ActiveInfractionMigrationTests(MigrationsTestCase): """ app = "api" - migration_prior = "0043_infraction_hidden_warnings_to_notes" - migration_target = "0044_active_infractions_migration" + migration_prior = "0045_add_plural_name_for_log_entry" + migration_target = "0046_active_infractions_migration" @classmethod def setUpMigrationData(cls, apps): |