diff options
| author |  Sebastiaan Zeeff <[email protected]> | 2019-11-03 21:08:33 +0100 |
|---|---|---|
| committer | Sebastiaan Zeeff <[email protected]> | 2019-11-03 21:08:33 +0100 |
| commit | 48617b0425bb6b4c7f253f9b44363432658c2f1c (patch) | |
| tree | 2f9484aaf0041fd9b8da50e3e6c77cb2f9c386d4 /pydis_site | |
| parent | Merge branch 'master' into active-infractions-validation (diff) | |
Resolve migration merge conflicts
Since other pull requests were merged that also included migrations
for the API app, this PR needed to be updated to avoid conflicts in
the migration history. In addition, the test files contained names of
specific migration files that needed to be updated to the correct
names after the merge resolution.
Diffstat (limited to 'pydis_site')
| -rw-r--r-- | pydis_site/apps/api/migrations/0047_active_infractions_migration.py (renamed from pydis_site/apps/api/migrations/0046_active_infractions_migration.py) | 2 | ||||
| -rw-r--r-- | pydis_site/apps/api/migrations/0048_add_infractions_unique_constraints_active.py (renamed from pydis_site/apps/api/migrations/0047_add_infractions_unique_constraints_active.py) | 2 | ||||
| -rw-r--r-- | pydis_site/apps/api/tests/migrations/test_active_infraction_migration.py | 8 | ||||
| -rw-r--r-- | pydis_site/apps/api/tests/migrations/test_base.py | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pydis_site/apps/api/migrations/0046_active_infractions_migration.py b/pydis_site/apps/api/migrations/0047_active_infractions_migration.py index cc53f58f..9ac791dc 100644 --- a/pydis_site/apps/api/migrations/0046_active_infractions_migration.py +++ b/pydis_site/apps/api/migrations/0047_active_infractions_migration.py @@ -96,7 +96,7 @@ class Migration(migrations.Migration): """Data migration to get the database consistent with the new infraction validation rules.""" dependencies = [ - ('api', '0045_add_plural_name_for_log_entry'), + ('api', '0046_reminder_jump_url'), ] operations = [ diff --git a/pydis_site/apps/api/migrations/0047_add_infractions_unique_constraints_active.py b/pydis_site/apps/api/migrations/0048_add_infractions_unique_constraints_active.py index dc266474..4ea1fb90 100644 --- a/pydis_site/apps/api/migrations/0047_add_infractions_unique_constraints_active.py +++ b/pydis_site/apps/api/migrations/0048_add_infractions_unique_constraints_active.py @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('api', '0046_active_infractions_migration'), + ('api', '0047_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 2d5fd94c..8dc29b34 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 = "0045_add_plural_name_for_log_entry" - migration_target = "0045_add_plural_name_for_log_entry" + migration_prior = "0046_reminder_jump_url" + migration_target = "0046_reminder_jump_url" @classmethod def setUpPostMigrationData(cls, apps): @@ -178,8 +178,8 @@ class ActiveInfractionMigrationTests(MigrationsTestCase): """ app = "api" - migration_prior = "0045_add_plural_name_for_log_entry" - migration_target = "0046_active_infractions_migration" + migration_prior = "0046_reminder_jump_url" + migration_target = "0047_active_infractions_migration" @classmethod def setUpMigrationData(cls, apps): diff --git a/pydis_site/apps/api/tests/migrations/test_base.py b/pydis_site/apps/api/tests/migrations/test_base.py index 5d38e2dd..f69bc92c 100644 --- a/pydis_site/apps/api/tests/migrations/test_base.py +++ b/pydis_site/apps/api/tests/migrations/test_base.py @@ -93,8 +93,8 @@ class MigrationsTestCaseNoSideEffectsTests(TestCase): class LifeOfBrian(MigrationsTestCase): app = "api" - migration_prior = "0045_add_plural_name_for_log_entry" - migration_target = "0047_add_infractions_unique_constraints_active" + migration_prior = "0046_reminder_jump_url" + migration_target = "0048_add_infractions_unique_constraints_active" @classmethod def log_last_migration(cls): |