From 1d0ea6decacab23fd40fb9716272b9d3a5f357b2 Mon Sep 17 00:00:00 2001 From: Zachary Hancock Date: Mon, 7 Oct 2024 17:03:42 -0400 Subject: [PATCH] feat: migration fix (#227) * chore: fix django-simple-history version * feat: migrations for correct django-simple-history version * feat: new version --- CHANGELOG.rst | 4 ++++ Makefile | 2 ++ edx_name_affirmation/__init__.py | 2 +- ...0010_alter_historicalverifiedname_options.py | 17 +++++++++++++++++ requirements/base.txt | 4 ++-- requirements/common_constraints.txt | 2 +- requirements/constraints.txt | 2 ++ requirements/doc.txt | 4 ++-- requirements/test.txt | 4 ++-- 9 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 edx_name_affirmation/migrations/0010_alter_historicalverifiedname_options.py diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 16e2707..6fd167b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,10 @@ Change Log Unreleased ~~~~~~~~~~ +[3.0.1] - 2024-10-07 +~~~~~~~~~~~~~~~~~~~~ +* Upgrade django-simple-history and add migration to match the new version. + [3.0.0] - 2024-09-30 ~~~~~~~~~~~~~~~~~~~~ * Add platform verification id field to the VerifiedName model diff --git a/Makefile b/Makefile index 997123b..82ed11a 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,8 @@ $(COMMON_CONSTRAINTS_TXT): upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: $(COMMON_CONSTRAINTS_TXT) + sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp + mv requirements/common_constraints.tmp requirements/common_constraints.txt pip install -qr requirements/pip-tools.txt # Make sure to compile files after any other files they include! # need to do this to remove django-simple-history from common constraint. diff --git a/edx_name_affirmation/__init__.py b/edx_name_affirmation/__init__.py index a600169..241222e 100644 --- a/edx_name_affirmation/__init__.py +++ b/edx_name_affirmation/__init__.py @@ -2,4 +2,4 @@ Django app housing name affirmation logic. """ -__version__ = '3.0.0' +__version__ = '3.0.1' diff --git a/edx_name_affirmation/migrations/0010_alter_historicalverifiedname_options.py b/edx_name_affirmation/migrations/0010_alter_historicalverifiedname_options.py new file mode 100644 index 0000000..c63afb2 --- /dev/null +++ b/edx_name_affirmation/migrations/0010_alter_historicalverifiedname_options.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.16 on 2024-10-07 15:25 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('edx_name_affirmation', '0009_add_verifiedname_platform_verification_id'), + ] + + operations = [ + migrations.AlterModelOptions( + name='historicalverifiedname', + options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical verified name', 'verbose_name_plural': 'historical verified names'}, + ), + ] diff --git a/requirements/base.txt b/requirements/base.txt index 193167d..6d52963 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -70,9 +70,9 @@ django-model-utils==5.0.0 # via # -r requirements/base.in # edx-celeryutils -django-simple-history==3.0.0 +django-simple-history==3.4.0 # via - # -c requirements/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/base.in django-waffle==4.1.0 # via diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 9a458f0..fc95227 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -22,7 +22,7 @@ Django<5.0 elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected -django-simple-history==3.0.0 + # Cause: https://github.com/openedx/event-tracking/pull/290 # event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform. diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 9396cee..d1559da 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -15,5 +15,7 @@ # the next major release, ensure the installed version is within boundaries. celery>=5.2.2,<6.0.0 +django-simple-history==3.4.0 + # Temporary to Support the python 3.11 Upgrade backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library diff --git a/requirements/doc.txt b/requirements/doc.txt index a478942..8288545 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -74,9 +74,9 @@ django-model-utils==5.0.0 # via # -r requirements/base.in # edx-celeryutils -django-simple-history==3.0.0 +django-simple-history==3.4.0 # via - # -c requirements/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/base.in django-waffle==4.1.0 # via diff --git a/requirements/test.txt b/requirements/test.txt index d14ef23..2e676c3 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -100,9 +100,9 @@ django-model-utils==5.0.0 # via # -r requirements/base.txt # edx-celeryutils -django-simple-history==3.0.0 +django-simple-history==3.4.0 # via - # -c requirements/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/base.txt django-waffle==4.1.0 # via