From b1948d53be9b7881a00c8085d467f8ee5a74ee5b Mon Sep 17 00:00:00 2001 From: James Kachel Date: Tue, 6 Aug 2024 07:40:13 -0500 Subject: [PATCH 1/3] Adds RUN_DATA_MIGRATIONS to the missing migrations check This will include the data_fixtures app, and thus will throw an error if you have conflicting migrations there too. --- scripts/test/detect_missing_migrations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test/detect_missing_migrations.sh b/scripts/test/detect_missing_migrations.sh index c1bc22bd1d..b1558047e9 100755 --- a/scripts/test/detect_missing_migrations.sh +++ b/scripts/test/detect_missing_migrations.sh @@ -9,7 +9,7 @@ fail() { exit 1 } -poetry run python ./manage.py makemigrations --no-input --dry-run >&"$TMPFILE" +RUN_DATA_MIGRATIONS=True poetry run python ./manage.py makemigrations --no-input --dry-run >&"$TMPFILE" if [[ $? -ne 0 ]]; then # makemigrations has returned a non-zero for some reason, possibly # because it needs input but --no-input is set From 7484b1ca2f4f373f56cd58c79c18b34e8a064076 Mon Sep 17 00:00:00 2001 From: James Kachel Date: Tue, 6 Aug 2024 07:47:51 -0500 Subject: [PATCH 2/3] Committing some conflicting migrations to the branch, on purpose, for science. The test updates should kick these out and the test should fail. --- .../migrations/0008_test_migration_branch_1.py | 14 ++++++++++++++ .../0008_test_migration_branch_1_copy.py | 14 ++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 data_fixtures/migrations/0008_test_migration_branch_1.py create mode 100644 data_fixtures/migrations/0008_test_migration_branch_1_copy.py diff --git a/data_fixtures/migrations/0008_test_migration_branch_1.py b/data_fixtures/migrations/0008_test_migration_branch_1.py new file mode 100644 index 0000000000..28ae1e9b34 --- /dev/null +++ b/data_fixtures/migrations/0008_test_migration_branch_1.py @@ -0,0 +1,14 @@ +# Generated by Django 4.2.14 on 2024-08-06 12:28 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ( + "data_fixtures", + "0007_topic_mappings_edx_add_programming_coding_to_computer_science", + ), + ] + + operations = [] diff --git a/data_fixtures/migrations/0008_test_migration_branch_1_copy.py b/data_fixtures/migrations/0008_test_migration_branch_1_copy.py new file mode 100644 index 0000000000..28ae1e9b34 --- /dev/null +++ b/data_fixtures/migrations/0008_test_migration_branch_1_copy.py @@ -0,0 +1,14 @@ +# Generated by Django 4.2.14 on 2024-08-06 12:28 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ( + "data_fixtures", + "0007_topic_mappings_edx_add_programming_coding_to_computer_science", + ), + ] + + operations = [] From 4f96e0f5c59a16e25fbf670f1ad51f05be12b831 Mon Sep 17 00:00:00 2001 From: James Kachel Date: Tue, 6 Aug 2024 07:54:11 -0500 Subject: [PATCH 3/3] Revert "Committing some conflicting migrations to the branch, on purpose, for science." - tests passed. This reverts commit 7484b1ca2f4f373f56cd58c79c18b34e8a064076, which added some bad migrations to ensure the CI workflow worked. It did, so these go away now. --- .../migrations/0008_test_migration_branch_1.py | 14 -------------- .../0008_test_migration_branch_1_copy.py | 14 -------------- 2 files changed, 28 deletions(-) delete mode 100644 data_fixtures/migrations/0008_test_migration_branch_1.py delete mode 100644 data_fixtures/migrations/0008_test_migration_branch_1_copy.py diff --git a/data_fixtures/migrations/0008_test_migration_branch_1.py b/data_fixtures/migrations/0008_test_migration_branch_1.py deleted file mode 100644 index 28ae1e9b34..0000000000 --- a/data_fixtures/migrations/0008_test_migration_branch_1.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 4.2.14 on 2024-08-06 12:28 - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ( - "data_fixtures", - "0007_topic_mappings_edx_add_programming_coding_to_computer_science", - ), - ] - - operations = [] diff --git a/data_fixtures/migrations/0008_test_migration_branch_1_copy.py b/data_fixtures/migrations/0008_test_migration_branch_1_copy.py deleted file mode 100644 index 28ae1e9b34..0000000000 --- a/data_fixtures/migrations/0008_test_migration_branch_1_copy.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 4.2.14 on 2024-08-06 12:28 - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ( - "data_fixtures", - "0007_topic_mappings_edx_add_programming_coding_to_computer_science", - ), - ] - - operations = []