Merge branch 'master' into upgrade-to-django42

openedx · Sep 27, 2023 · 86e9b64 · 86e9b64
2 parents 0139e55 + 0cf48fb
commit 86e9b64
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -115,6 +115,7 @@ upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt fil
 	# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
 	# See BOM-271 for more details.
 	sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
+	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
 	# Make sure to compile files after any other files they include!
 	pip-compile --upgrade --rebuild --allow-unsafe -o requirements/pip.txt requirements/pip.in

diff --git a/license_manager/apps/subscriptions/migrations/0061_auto_20230927_1119.py b/license_manager/apps/subscriptions/migrations/0061_auto_20230927_1119.py
@@ -0,0 +1,41 @@
+# Generated by Django 3.2.21 on 2023-09-27 11:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('subscriptions', '0060_historicalsubscriptionlicensesource'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='historicalcustomeragreement',
+            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical Customer Agreement', 'verbose_name_plural': 'historical Customer Agreements'},
+        ),
+        migrations.AlterModelOptions(
+            name='historicallicense',
+            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical license', 'verbose_name_plural': 'historical licenses'},
+        ),
+        migrations.AlterModelOptions(
+            name='historicalnotification',
+            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical notification', 'verbose_name_plural': 'historical notifications'},
+        ),
+        migrations.AlterModelOptions(
+            name='historicalproduct',
+            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical product', 'verbose_name_plural': 'historical products'},
+        ),
+        migrations.AlterModelOptions(
+            name='historicalsubscriptionlicensesource',
+            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical subscription license source', 'verbose_name_plural': 'historical subscription license sources'},
+        ),
+        migrations.AlterModelOptions(
+            name='historicalsubscriptionplan',
+            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical Subscription Plan', 'verbose_name_plural': 'historical Subscription Plans'},
+        ),
+        migrations.AlterModelOptions(
+            name='historicalsubscriptionplanrenewal',
+            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical Subscription Plan Renewal', 'verbose_name_plural': 'historical Subscription Plan Renewals'},
+        ),
+    ]
diff --git a/license_manager/settings/base.py b/license_manager/settings/base.py
@@ -440,3 +440,6 @@
 
 # Django Admin Settings
 VALIDATE_FORM_EXTERNAL_FIELDS = True
+
+# disable indexing on history_date
+SIMPLE_HISTORY_DATE_INDEX = False
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -117,10 +117,8 @@ django-model-utils==4.3.1
     #   edx-rbac
 django-ses==3.5.0
     # via -r requirements/base.in
-django-simple-history==3.0.0
-    # via
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/base.in
+django-simple-history==3.4.0
+    # via -r requirements/base.in
 django-waffle==4.0.0
     # via
     #   -r requirements/base.in

diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -25,7 +25,7 @@
 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
+
 
 # tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
 # Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -191,10 +191,8 @@ django-model-utils==4.3.1
     #   edx-rbac
 django-ses==3.5.0
     # via -r requirements/validation.txt
-django-simple-history==3.0.0
-    # via
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/validation.txt
+django-simple-history==3.4.0
+    # via -r requirements/validation.txt
 django-waffle==4.0.0
     # via
     #   -r requirements/validation.txt

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -181,10 +181,8 @@ django-model-utils==4.3.1
     #   edx-rbac
 django-ses==3.5.0
     # via -r requirements/test.txt
-django-simple-history==3.0.0
-    # via
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/test.txt
+django-simple-history==3.4.0
+    # via -r requirements/test.txt
 django-waffle==4.0.0
     # via
     #   -r requirements/test.txt

diff --git a/requirements/production.txt b/requirements/production.txt
@@ -146,10 +146,8 @@ django-model-utils==4.3.1
     #   edx-rbac
 django-ses==3.5.0
     # via -r requirements/base.txt
-django-simple-history==3.0.0
-    # via
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/base.txt
+django-simple-history==3.4.0
+    # via -r requirements/base.txt
 django-waffle==4.0.0
     # via
     #   -r requirements/base.txt

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -158,10 +158,8 @@ django-model-utils==4.3.1
     #   edx-rbac
 django-ses==3.5.0
     # via -r requirements/base.txt
-django-simple-history==3.0.0
-    # via
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/base.txt
+django-simple-history==3.4.0
+    # via -r requirements/base.txt
 django-waffle==4.0.0
     # via
     #   -r requirements/base.txt

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -167,10 +167,8 @@ django-model-utils==4.3.1
     #   edx-rbac
 django-ses==3.5.0
     # via -r requirements/base.txt
-django-simple-history==3.0.0
-    # via
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/base.txt
+django-simple-history==3.4.0
+    # via -r requirements/base.txt
 django-waffle==4.0.0
     # via
     #   -r requirements/base.txt

diff --git a/requirements/validation.txt b/requirements/validation.txt
@@ -213,9 +213,8 @@ django-ses==3.5.0
     # via
     #   -r requirements/quality.txt
     #   -r requirements/test.txt
-django-simple-history==3.0.0
+django-simple-history==3.4.0
     # via
-    #   -c requirements/common_constraints.txt
     #   -r requirements/quality.txt
     #   -r requirements/test.txt
 django-waffle==4.0.0