From 73498df31e9a4433e076e5285541853995e3f9c4 Mon Sep 17 00:00:00 2001 From: Rebecca David Date: Tue, 29 Aug 2023 08:03:43 -0400 Subject: [PATCH] fix: conflicting migrations --- .../migrations/0044_auto_20220808_2144.py | 7 ++++++- ...ollmentcelebration_celebrate_weekly_goal.py | 18 ------------------ ...046_alter_userprofile_level_of_education.py | 18 ------------------ 3 files changed, 6 insertions(+), 37 deletions(-) delete mode 100644 common/djangoapps/student/migrations/0044_courseenrollmentcelebration_celebrate_weekly_goal.py delete mode 100644 common/djangoapps/student/migrations/0046_alter_userprofile_level_of_education.py diff --git a/common/djangoapps/student/migrations/0044_auto_20220808_2144.py b/common/djangoapps/student/migrations/0044_auto_20220808_2144.py index 91b18fbfe05d..28147a106c35 100644 --- a/common/djangoapps/student/migrations/0044_auto_20220808_2144.py +++ b/common/djangoapps/student/migrations/0044_auto_20220808_2144.py @@ -18,6 +18,11 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='userprofile', name='level_of_education', - field=models.CharField(blank=True, choices=[('p', 'Doctorate'), ('m', "Master's degree"), ('b', '4-year degree'), ('a', '2-year degree'), ('hs', 'High School or GED'), ('some-hs', 'Some high school'), ('some-college', 'Some college'), ('jd-md', 'Professional degree (J.D., M.D.)'), ('prefer-not-to-say', 'Prefer not to say')], db_index=True, max_length=25, null=True), + field=models.CharField(blank=True, choices=[('some-hs', 'Some high school'), ('hs', 'High School or GED'), ('some-college', 'Some college'), ('a', '2-year degree'), ('b', '4-year degree'), ('m', "Master's"), ('p', 'Doctorate'), ('jd-md', 'Professional degree (J.D., M.D.)'), ('prefer-not-to-say', 'Prefer not to say')], db_index=True, max_length=25, null=True), + ), + migrations.AddField( + model_name='courseenrollmentcelebration', + name='celebrate_weekly_goal', + field=models.BooleanField(default=False), ), ] diff --git a/common/djangoapps/student/migrations/0044_courseenrollmentcelebration_celebrate_weekly_goal.py b/common/djangoapps/student/migrations/0044_courseenrollmentcelebration_celebrate_weekly_goal.py deleted file mode 100644 index 59ca6827a559..000000000000 --- a/common/djangoapps/student/migrations/0044_courseenrollmentcelebration_celebrate_weekly_goal.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.11 on 2022-01-11 14:17 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('student', '0043_remove_userprofile_allow_certificate'), - ] - - operations = [ - migrations.AddField( - model_name='courseenrollmentcelebration', - name='celebrate_weekly_goal', - field=models.BooleanField(default=False), - ), - ] diff --git a/common/djangoapps/student/migrations/0046_alter_userprofile_level_of_education.py b/common/djangoapps/student/migrations/0046_alter_userprofile_level_of_education.py deleted file mode 100644 index f076ccc95c11..000000000000 --- a/common/djangoapps/student/migrations/0046_alter_userprofile_level_of_education.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.13 on 2022-08-13 04:25 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('student', '0045_alter_userprofile_gender'), - ] - - operations = [ - migrations.AlterField( - model_name='userprofile', - name='level_of_education', - field=models.CharField(blank=True, choices=[('some-hs', 'Some high school'), ('hs', 'High School or GED'), ('some-college', 'Some college'), ('a', '2-year degree'), ('b', '4-year degree'), ('m', "Master's"), ('p', 'Doctorate'), ('jd-md', 'Professional degree (J.D., M.D.)'), ('prefer-not-to-say', 'Prefer not to say')], db_index=True, max_length=25, null=True), - ), - ]