From 35d4ec89285595e8e5a632814dc7fabee27f6b53 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Tue, 26 Sep 2023 19:52:10 +0500 Subject: [PATCH 1/8] feat: upgrading django-history package. --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 25f1fc6b5..d98d79fe3 100644 --- a/Makefile +++ b/Makefile @@ -95,6 +95,8 @@ html_coverage: ## generate and view HTML coverage report 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! + 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 --rebuild --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 From 63b9f2eddf58bbd7df79a1c33d7991f49e8403b2 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Tue, 26 Sep 2023 19:52:24 +0500 Subject: [PATCH 2/8] feat: upgrading django-history package. --- enterprise_catalog/settings/base.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/enterprise_catalog/settings/base.py b/enterprise_catalog/settings/base.py index b02d45499..6f25ce875 100644 --- 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 From 50232236bf31c1effbbac87688c8217d9341a07f Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Tue, 26 Sep 2023 19:58:58 +0500 Subject: [PATCH 3/8] feat: upgrading django-history package. --- ...toricalcontentmetadata_options_and_more.py | 34 +++++++++++++++++++ ...terprisecurationconfig_options_and_more.py | 25 ++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 enterprise_catalog/apps/catalog/migrations/0037_alter_historicalcontentmetadata_options_and_more.py create mode 100644 enterprise_catalog/apps/curation/migrations/0003_alter_historicalenterprisecurationconfig_options_and_more.py diff --git a/enterprise_catalog/apps/catalog/migrations/0037_alter_historicalcontentmetadata_options_and_more.py b/enterprise_catalog/apps/catalog/migrations/0037_alter_historicalcontentmetadata_options_and_more.py new file mode 100644 index 000000000..34841a48d --- /dev/null +++ b/enterprise_catalog/apps/catalog/migrations/0037_alter_historicalcontentmetadata_options_and_more.py @@ -0,0 +1,34 @@ +# Generated by Django 4.2.5 on 2023-09-26 14:55 + +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, to='catalog.contentmetadata'), + ), + ] diff --git a/enterprise_catalog/apps/curation/migrations/0003_alter_historicalenterprisecurationconfig_options_and_more.py b/enterprise_catalog/apps/curation/migrations/0003_alter_historicalenterprisecurationconfig_options_and_more.py new file mode 100644 index 000000000..ccdce7415 --- /dev/null +++ b/enterprise_catalog/apps/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'}, + ), + ] From 2e54e0026687295ba823d10e7129d1fea73cd004 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Tue, 26 Sep 2023 11:10:48 -0400 Subject: [PATCH 4/8] chore: Updating Python Requirements --- requirements/base.txt | 6 +++--- requirements/dev.txt | 8 ++++---- requirements/doc.txt | 8 ++++---- requirements/production.txt | 6 +++--- requirements/quality.txt | 6 +++--- requirements/test.txt | 8 ++++---- requirements/validation.txt | 8 ++++---- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index daed8b6da..8b852e82c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -135,7 +135,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 +187,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 +311,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/dev.txt b/requirements/dev.txt index e78c49329..0e72aed00 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -256,7 +256,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 +418,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 @@ -715,7 +715,7 @@ tox==3.28.0 # 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 +771,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 index 58f0971de..47e7703f0 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -212,7 +212,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 +326,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 @@ -590,7 +590,7 @@ tox==3.28.0 # 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 +636,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 index b557ee7fb..1f3f9c788 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -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 index 38308d946..2b14bf5f3 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -176,7 +176,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 +262,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 +469,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 diff --git a/requirements/test.txt b/requirements/test.txt index 0797a80bd..b65a7791e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -186,7 +186,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 @@ -282,7 +282,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 @@ -487,7 +487,7 @@ tox==3.28.0 # tox-battery tox-battery==0.6.2 # via -r requirements/test.in -types-pyyaml==6.0.12.11 +types-pyyaml==6.0.12.12 # via responses typing-extensions==4.8.0 # via @@ -526,7 +526,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 diff --git a/requirements/validation.txt b/requirements/validation.txt index d6ae09f30..c724f4e22 100644 --- a/requirements/validation.txt +++ b/requirements/validation.txt @@ -240,7 +240,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 @@ -384,7 +384,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 @@ -654,7 +654,7 @@ tox==3.28.0 # 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 @@ -706,7 +706,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 From 0d32fb59430c3a1c1a0744fbbf2613e66f184aac Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Tue, 26 Sep 2023 22:06:56 +0500 Subject: [PATCH 5/8] feat: upgrading django-history package. --- Makefile | 29 ++++++++++++++++++----------- requirements/base.txt | 8 +++----- requirements/common_constraints.txt | 10 +++++----- requirements/constraints.txt | 7 ++++--- requirements/dev.txt | 7 +++---- requirements/doc.txt | 10 ++++------ requirements/production.txt | 2 +- requirements/quality.txt | 8 +++----- requirements/test.txt | 10 ++++------ requirements/validation.txt | 7 +++---- 10 files changed, 48 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index d98d79fe3..94d86c77e 100644 --- a/Makefile +++ b/Makefile @@ -92,22 +92,29 @@ 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! +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 --rebuild --upgrade -o requirements/pip.txt requirements/pip.in - pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in + pip-compile --rebuild --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in pip install -qr requirements/pip.txt pip install -qr requirements/pip-tools.txt - pip-compile --upgrade -o requirements/base.txt requirements/base.in - pip-compile --upgrade -o requirements/test.txt requirements/test.in - pip-compile --upgrade -o requirements/doc.txt requirements/doc.in - pip-compile --upgrade -o requirements/quality.txt requirements/quality.in - pip-compile --upgrade -o requirements/validation.txt requirements/validation.in - pip-compile --upgrade -o requirements/dev.txt requirements/dev.in - pip-compile --upgrade -o requirements/production.txt requirements/production.in + pip-compile --rebuild --upgrade -o requirements/base.txt requirements/base.in + pip-compile --rebuild --upgrade -o requirements/test.txt requirements/test.in + pip-compile --rebuild --upgrade -o requirements/doc.txt requirements/doc.in + pip-compile --rebuild --upgrade -o requirements/quality.txt requirements/quality.in + pip-compile --rebuild --upgrade -o requirements/validation.txt requirements/validation.in + pip-compile --rebuild --upgrade -o requirements/dev.txt requirements/dev.in + pip-compile --rebuild --upgrade -o requirements/production.txt requirements/production.in # Let tox control the Django version for tests grep -e "^django==" requirements/base.txt > requirements/django.txt sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp diff --git a/requirements/base.txt b/requirements/base.txt index 8b852e82c..34ddfd77b 100644 --- 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 diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 72021fe71..08e94f34d 100644 --- 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 index 39067fd08..69d47da15 100644 --- 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 index 0e72aed00..623383181 100644 --- 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 @@ -710,7 +709,7 @@ 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 diff --git a/requirements/doc.txt b/requirements/doc.txt index 47e7703f0..762497488 100644 --- 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 @@ -585,7 +583,7 @@ 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 diff --git a/requirements/production.txt b/requirements/production.txt index 1f3f9c788..4d0b0bed6 100644 --- 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 diff --git a/requirements/quality.txt b/requirements/quality.txt index 2b14bf5f3..2f9a57d4f 100644 --- 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 diff --git a/requirements/test.txt b/requirements/test.txt index b65a7791e..d881630e8 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -111,7 +111,7 @@ dill==0.3.7 distlib==0.3.7 # via virtualenv # 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 @@ -161,10 +161,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 @@ -482,7 +480,7 @@ tomlkit==0.12.1 # via 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.in # tox-battery tox-battery==0.6.2 diff --git a/requirements/validation.txt b/requirements/validation.txt index c724f4e22..4b9650bba 100644 --- a/requirements/validation.txt +++ b/requirements/validation.txt @@ -142,7 +142,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 @@ -207,9 +207,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 @@ -649,7 +648,7 @@ 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 From ef2a644d79a6a205fedc413a58247dca17283c6d Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Tue, 26 Sep 2023 23:34:12 +0500 Subject: [PATCH 6/8] chore: Delete migration. --- ...toricalcontentmetadata_options_and_more.py | 34 ------------------- 1 file changed, 34 deletions(-) delete mode 100644 enterprise_catalog/apps/catalog/migrations/0037_alter_historicalcontentmetadata_options_and_more.py diff --git a/enterprise_catalog/apps/catalog/migrations/0037_alter_historicalcontentmetadata_options_and_more.py b/enterprise_catalog/apps/catalog/migrations/0037_alter_historicalcontentmetadata_options_and_more.py deleted file mode 100644 index 34841a48d..000000000 --- a/enterprise_catalog/apps/catalog/migrations/0037_alter_historicalcontentmetadata_options_and_more.py +++ /dev/null @@ -1,34 +0,0 @@ -# Generated by Django 4.2.5 on 2023-09-26 14:55 - -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, to='catalog.contentmetadata'), - ), - ] From cf4798fabf4dfeae428b48887b5096b5ee63c1d6 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Tue, 26 Sep 2023 23:36:18 +0500 Subject: [PATCH 7/8] chore: Adding migration. --- .../migrations/0037_auto_20230926_1835.py | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 enterprise_catalog/apps/catalog/migrations/0037_auto_20230926_1835.py diff --git a/enterprise_catalog/apps/catalog/migrations/0037_auto_20230926_1835.py b/enterprise_catalog/apps/catalog/migrations/0037_auto_20230926_1835.py new file mode 100644 index 000000000..ebac8003f --- /dev/null +++ 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'), + ), + ] From 48a46ac41b3f44152a34e84a144e12dad6550722 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Wed, 27 Sep 2023 15:43:02 +0500 Subject: [PATCH 8/8] chore: Update Makefile --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 94d86c77e..68a827150 100644 --- a/Makefile +++ b/Makefile @@ -104,17 +104,17 @@ upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt fil # 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 --rebuild --upgrade -o requirements/pip.txt requirements/pip.in - pip-compile --rebuild --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in + 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 - pip-compile --rebuild --upgrade -o requirements/base.txt requirements/base.in - pip-compile --rebuild --upgrade -o requirements/test.txt requirements/test.in - pip-compile --rebuild --upgrade -o requirements/doc.txt requirements/doc.in - pip-compile --rebuild --upgrade -o requirements/quality.txt requirements/quality.in - pip-compile --rebuild --upgrade -o requirements/validation.txt requirements/validation.in - pip-compile --rebuild --upgrade -o requirements/dev.txt requirements/dev.in - pip-compile --rebuild --upgrade -o requirements/production.txt requirements/production.in + pip-compile --upgrade -o requirements/base.txt requirements/base.in + pip-compile --upgrade -o requirements/test.txt requirements/test.in + pip-compile --upgrade -o requirements/doc.txt requirements/doc.in + pip-compile --upgrade -o requirements/quality.txt requirements/quality.in + pip-compile --upgrade -o requirements/validation.txt requirements/validation.in + pip-compile --upgrade -o requirements/dev.txt requirements/dev.in + pip-compile --upgrade -o requirements/production.txt requirements/production.in # Let tox control the Django version for tests grep -e "^django==" requirements/base.txt > requirements/django.txt sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp