openedx · awais786 · Sep 26, 2023 · Sep 26, 2023 · Sep 26, 2023 · Sep 26, 2023
diff --git a/Makefile b/Makefile
@@ -92,10 +92,19 @@ migrate: ## apply database migrations
 html_coverage: ## generate and view HTML coverage report
 	coverage html && open htmlcov/index.html
 
-upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
-upgrade: piptools ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
-	# Make sure to compile files after any other files they include!
-	pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in
+COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt
+.PHONY: $(COMMON_CONSTRAINTS_TXT)
+$(COMMON_CONSTRAINTS_TXT):
+	wget -O "$(@)" https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt || touch "$(@)"
+	echo "$(COMMON_CONSTRAINTS_TEMP_COMMENT)" | cat - $(@) > temp && mv temp $(@)
+
+export CUSTOM_COMPILE_COMMAND = make upgrade
+upgrade: piptools $(COMMON_CONSTRAINTS_TXT)	## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
+	# This is a temporary solution to override the real common_constraints.txt
+	# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
+	sed '/^django-simple-history==/d' requirements/common_constraints.txt > requirements/common_constraints.tmp
+	mv requirements/common_constraints.tmp requirements/common_constraints.txt
+	pip-compile --allow-unsafe --upgrade -o requirements/pip.txt requirements/pip.in
 	pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
 	pip install -qr requirements/pip.txt
 	pip install -qr requirements/pip-tools.txt

diff --git a/enterprise_catalog/apps/catalog/migrations/0037_auto_20230926_1835.py b/enterprise_catalog/apps/catalog/migrations/0037_auto_20230926_1835.py
@@ -0,0 +1,34 @@
+# Generated by Django 3.2.21 on 2023-09-26 18:35
+
+import collections
+from django.db import migrations, models
+import jsonfield.encoder
+import jsonfield.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalog', '0036_auto_20230306_1550'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='historicalcontentmetadata',
+            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical Content Metadata', 'verbose_name_plural': 'historical Content Metadata'},
+        ),
+        migrations.AlterModelOptions(
+            name='historicalenterprisecatalog',
+            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical Enterprise Catalog', 'verbose_name_plural': 'historical Enterprise Catalogs'},
+        ),
+        migrations.AlterField(
+            model_name='catalogquery',
+            name='content_filter',
+            field=jsonfield.fields.JSONField(default=dict, dump_kwargs={'cls': jsonfield.encoder.JSONEncoder, 'ensure_ascii': False, 'indent': 4, 'separators': (',', ':')}, help_text="Query parameters which will be used to filter the discovery service's search/all endpoint results, specified as a JSON object.", load_kwargs={'object_pairs_hook': collections.OrderedDict}),
+        ),
+        migrations.AlterField(
+            model_name='contentmetadata',
+            name='associated_content_metadata',
+            field=models.ManyToManyField(blank=True, related_name='_catalog_contentmetadata_associated_content_metadata_+', to='catalog.ContentMetadata'),
+        ),
+    ]
diff --git a/...pps/curation/migrations/0003_alter_historicalenterprisecurationconfig_options_and_more.py b/...pps/curation/migrations/0003_alter_historicalenterprisecurationconfig_options_and_more.py
@@ -0,0 +1,25 @@
+# Generated by Django 4.2.5 on 2023-09-26 14:55
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('curation', '0002_add_can_only_view_highlight_sets'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='historicalenterprisecurationconfig',
+            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical Enterprise curation', 'verbose_name_plural': 'historical Enterprise curations'},
+        ),
+        migrations.AlterModelOptions(
+            name='historicalhighlightedcontent',
+            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical highlighted content', 'verbose_name_plural': 'historical highlighted contents'},
+        ),
+        migrations.AlterModelOptions(
+            name='historicalhighlightset',
+            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical highlight set', 'verbose_name_plural': 'historical highlight sets'},
+        ),
+    ]
diff --git a/enterprise_catalog/settings/base.py b/enterprise_catalog/settings/base.py
@@ -429,3 +429,7 @@
     'VERSION': '1.0.0',
     'SERVE_INCLUDE_SCHEMA': False,
 }
+
+
+# disable indexing on history_date
+SIMPLE_HISTORY_DATE_INDEX = False
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -65,7 +65,7 @@ defusedxml==0.7.1
     #   social-auth-core
 django==3.2.21
     # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
     #   django-celery-results
@@ -113,10 +113,8 @@ django-model-utils==4.3.1
     #   -r requirements/base.in
     #   edx-celeryutils
     #   edx-rbac
-django-simple-history==3.0.0
-    # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
-    #   -r requirements/base.in
+django-simple-history==3.4.0
+    # via -r requirements/base.in
 django-waffle==4.0.0
     # via
     #   edx-django-utils
@@ -135,7 +133,7 @@ djangorestframework-xml==2.0.0
     # via -r requirements/base.in
 drf-jwt==1.19.2
     # via edx-drf-extensions
-drf-spectacular==0.26.4
+drf-spectacular==0.26.5
     # via -r requirements/base.in
 edx-auth-backends==4.2.0
     # via -r requirements/base.in
@@ -187,7 +185,7 @@ monotonic==1.6
     # via analytics-python
 mysqlclient==2.2.0
     # via -r requirements/base.in
-newrelic==9.0.0
+newrelic==9.1.0
     # via edx-django-utils
 oauthlib==3.2.2
     # via
@@ -311,7 +309,7 @@ vine==5.0.0
     #   kombu
 wcwidth==0.2.6
     # via prompt-toolkit
-xlsxwriter==3.1.4
+xlsxwriter==3.1.5
     # via -r requirements/base.in
 zipp==3.17.0
     # via

diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -1,7 +1,3 @@
-# This is a temporary solution to override the real common_constraints.txt
-# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
-# See BOM-2721 for more details.
-# Below is the copied and edited version of common_constraints
 
 # A central location for most common version constraints
 # (across edx repos) for pip-installation.
@@ -24,4 +20,8 @@ Django<4.0
 # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
 elasticsearch<7.14.0
 
-setuptools<60
+# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
+
+# 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
+tox<4.0.0
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -8,10 +8,10 @@
 # pin when possible.  Writing an issue against the offending project and
 # linking to it here is good.
 
-Django>=3.2,<4.0
-
 # Common constraints for edx repos
--c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+-c common_constraints.txt
+
+Django>=3.2,<4.0
 
 # As it is not clarified what exact breaking changes will be introduced as per
 # the next major release, ensure the installed version is within boundaries.
@@ -33,3 +33,4 @@ redis<4
 edx-lint<5.3
 pylint<2.15
 astroid<2.12
+
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -154,7 +154,7 @@ distlib==0.3.7
     #   virtualenv
 django==3.2.21
     # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   -r requirements/quality.txt
     #   -r requirements/test.txt
@@ -223,9 +223,8 @@ django-model-utils==4.3.1
     #   -r requirements/test.txt
     #   edx-celeryutils
     #   edx-rbac
-django-simple-history==3.0.0
+django-simple-history==3.4.0
     # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/quality.txt
     #   -r requirements/test.txt
 django-waffle==4.0.0
@@ -256,7 +255,7 @@ drf-jwt==1.19.2
     #   -r requirements/quality.txt
     #   -r requirements/test.txt
     #   edx-drf-extensions
-drf-spectacular==0.26.4
+drf-spectacular==0.26.5
     # via
     #   -r requirements/quality.txt
     #   -r requirements/test.txt
@@ -418,7 +417,7 @@ mysqlclient==2.2.0
     # via
     #   -r requirements/quality.txt
     #   -r requirements/test.txt
-newrelic==9.0.0
+newrelic==9.1.0
     # via
     #   -r requirements/quality.txt
     #   -r requirements/test.txt
@@ -710,12 +709,12 @@ tomlkit==0.12.1
     #   pylint
 tox==3.28.0
     # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   -c requirements/common_constraints.txt
     #   -r requirements/test.txt
     #   tox-battery
 tox-battery==0.6.2
     # via -r requirements/test.txt
-types-pyyaml==6.0.12.11
+types-pyyaml==6.0.12.12
     # via
     #   -r requirements/test.txt
     #   responses
@@ -771,7 +770,7 @@ wrapt==1.15.0
     #   -r requirements/quality.txt
     #   -r requirements/test.txt
     #   astroid
-xlsxwriter==3.1.4
+xlsxwriter==3.1.5
     # via
     #   -r requirements/quality.txt
     #   -r requirements/test.txt

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -128,7 +128,7 @@ distlib==0.3.7
     #   virtualenv
 django==3.2.21
     # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   django-celery-results
@@ -178,10 +178,8 @@ django-model-utils==4.3.1
     #   -r requirements/test.txt
     #   edx-celeryutils
     #   edx-rbac
-django-simple-history==3.0.0
-    # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/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
@@ -212,7 +210,7 @@ drf-jwt==1.19.2
     # via
     #   -r requirements/test.txt
     #   edx-drf-extensions
-drf-spectacular==0.26.4
+drf-spectacular==0.26.5
     # via -r requirements/test.txt
 edx-auth-backends==4.2.0
     # via -r requirements/test.txt
@@ -326,7 +324,7 @@ monotonic==1.6
     #   analytics-python
 mysqlclient==2.2.0
     # via -r requirements/test.txt
-newrelic==9.0.0
+newrelic==9.1.0
     # via
     #   -r requirements/test.txt
     #   edx-django-utils
@@ -585,12 +583,12 @@ tomlkit==0.12.1
     #   pylint
 tox==3.28.0
     # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   -c requirements/common_constraints.txt
     #   -r requirements/test.txt
     #   tox-battery
 tox-battery==0.6.2
     # via -r requirements/test.txt
-types-pyyaml==6.0.12.11
+types-pyyaml==6.0.12.12
     # via
     #   -r requirements/test.txt
     #   responses
@@ -636,7 +634,7 @@ wrapt==1.15.0
     # via
     #   -r requirements/test.txt
     #   astroid
-xlsxwriter==3.1.4
+xlsxwriter==3.1.5
     # via -r requirements/test.txt
 zipp==3.17.0
     # via

diff --git a/requirements/production.txt b/requirements/production.txt
@@ -136,7 +136,7 @@ django-model-utils==4.3.1
     #   -r requirements/base.txt
     #   edx-celeryutils
     #   edx-rbac
-django-simple-history==3.0.0
+django-simple-history==3.4.0
     # via -r requirements/base.txt
 django-waffle==4.0.0
     # via
@@ -159,7 +159,7 @@ drf-jwt==1.19.2
     # via
     #   -r requirements/base.txt
     #   edx-drf-extensions
-drf-spectacular==0.26.4
+drf-spectacular==0.26.5
     # via -r requirements/base.txt
 edx-auth-backends==4.2.0
     # via -r requirements/base.txt
@@ -239,7 +239,7 @@ monotonic==1.6
     #   analytics-python
 mysqlclient==2.2.0
     # via -r requirements/base.txt
-newrelic==9.0.0
+newrelic==9.1.0
     # via
     #   -r requirements/base.txt
     #   edx-django-utils
@@ -418,7 +418,7 @@ wcwidth==0.2.6
     # via
     #   -r requirements/base.txt
     #   prompt-toolkit
-xlsxwriter==3.1.4
+xlsxwriter==3.1.5
     # via -r requirements/base.txt
 zipp==3.17.0
     # via

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -103,7 +103,7 @@ dill==0.3.7
     # via pylint
 django==3.2.21
     # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   -r requirements/base.txt
     #   django-celery-results
@@ -151,10 +151,8 @@ django-model-utils==4.3.1
     #   -r requirements/base.txt
     #   edx-celeryutils
     #   edx-rbac
-django-simple-history==3.0.0
-    # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/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
@@ -176,7 +174,7 @@ drf-jwt==1.19.2
     # via
     #   -r requirements/base.txt
     #   edx-drf-extensions
-drf-spectacular==0.26.4
+drf-spectacular==0.26.5
     # via -r requirements/base.txt
 edx-auth-backends==4.2.0
     # via -r requirements/base.txt
@@ -262,7 +260,7 @@ monotonic==1.6
     #   analytics-python
 mysqlclient==2.2.0
     # via -r requirements/base.txt
-newrelic==9.0.0
+newrelic==9.1.0
     # via
     #   -r requirements/base.txt
     #   edx-django-utils
@@ -469,7 +467,7 @@ wcwidth==0.2.6
     #   prompt-toolkit
 wrapt==1.15.0
     # via astroid
-xlsxwriter==3.1.4
+xlsxwriter==3.1.5
     # via -r requirements/base.txt
 zipp==3.17.0
     # via