From 3b953a1a79486df5dfc95bcfff7a5205fbd5e3e2 Mon Sep 17 00:00:00 2001 From: Brian Beggs Date: Thu, 2 Nov 2023 14:52:56 -0400 Subject: [PATCH] chore: Updates to requirement constraints to install the desired versions of Django and django-simple-history --- Makefile | 3 ++- requirements/common_constraints.txt | 7 ------- requirements/constraints.txt | 5 ++++- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index b315564b..9850f469 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ lint: ## run Python code linting pylint: lint quality: - tox -e quality + tox -e quality pii_check: ## check for PII annotations on all Django models DJANGO_SETTINGS_MODULE=enterprise_subsidy.settings.test \ @@ -115,6 +115,7 @@ $(COMMON_CONSTRAINTS_TXT): upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in sed -i.'' 's/Django<4.0//g' requirements/common_constraints.txt + sed -i.'' 's/django-simple-history==//g' requirements/common_constraints.txt pip install -qr requirements/pip-tools.txt # Make sure to compile files after any other files they include! $(PIP_COMPILE) --allow-unsafe -o requirements/pip.txt requirements/pip.in diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 5a86f013..56871794 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -12,17 +12,10 @@ # Note: Changes to this file will automatically be used by other repos, referencing # this file from Github directly. It does not require packaging in edx-lint. - -# using LTS django version -Django<4.0 - # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process. # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html elasticsearch<7.14.0 -# 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 82c8bb38..dfc51e94 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -11,5 +11,8 @@ # Common constraints for edx repos -c common_constraints.txt -Django<4.3 +# using LTS django version +Django>=4.2,<4.3 +# django-simple-history>3.4.0 for this repo... we were not concerned about migration issues +django-simple-history>=3.4.0,<3.5.0