build: fix django/tox/upgrade dependency malarkey

Makefile

@@ -130,10 +130,6 @@ upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with t
 	$(PIP_COMPILE) -o requirements/ci.txt requirements/ci.in
 	$(PIP_COMPILE) -o requirements/dev.txt requirements/dev.in
 	$(PIP_COMPILE) -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
-	mv requirements/test.tmp requirements/test.txt
 
 extract_translations: ## extract strings to be translated, outputting .mo files
 	python manage.py makemessages -l en -v1 -d django

requirements/common_constraints.txt

@@ -3,6 +3,11 @@
 # See BOM-2721 for more details.
 # Below is the copied and edited version of common_constraints
 
+# 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.
 #

requirements/test.txt

@@ -79,6 +79,7 @@ dill==0.3.8
     # via pylint
 distlib==0.3.8
     # via virtualenv
+django==4.2.15
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/base.txt

tox.ini

@@ -81,7 +81,8 @@ commands =
 [testenv:pii_check]
 setenv = 
     DJANGO_SETTINGS_MODULE = enterprise_subsidy.settings.test
-deps = 
+deps =
+     django42: Django>=4.2,<4.3
     -r{toxinidir}/requirements/test.txt
 commands = 
     code_annotations django_find_annotations --config_file .pii_annotations.yml --lint --report --coverage