feanil/fix make upgrade

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         python-version: ["3.12"]
-        toxenv: [quality, docs, pii_check, django42]
+        toxenv: [quality, docs, pii_check, django52]
     steps:
       - uses: actions/checkout@v4
       - name: setup python
@@ -39,7 +39,7 @@ jobs:
         run: tox
 
       - name: Run coverage
-        if: matrix.python-version == '3.12' && matrix.toxenv == 'django42'
+        if: matrix.python-version == '3.12' && matrix.toxenv == 'django52'
         uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

backend/Makefile

@@ -35,11 +35,9 @@ docs: ## generate Sphinx HTML documentation, including API docs
 # Define PIP_COMPILE_OPTS=-v to get more information during make upgrade.
 PIP_COMPILE = pip-compile $(PIP_COMPILE_OPTS)
 
-compile-requirements: ## compile the requirements/*.txt files with the latest packages satisfying requirements/*.in
-	pip install -qr requirements/pip-tools.txt
-	pip-compile -v ${COMPILE_OPTS} --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in
-	pip-compile -v ${COMPILE_OPTS} -o requirements/pip-tools.txt requirements/pip-tools.in
-	pip install -qr requirements/pip.txt
+compile-requirements: export CUSTOM_COMPILE_COMMAND=make upgrade
+compile-requirements: piptools ## compile the requirements/*.txt files with the latest packages satisfying requirements/*.in
+	pip-compile -v ${PIP_COMPILE_OPTS} --allow-unsafe --rebuild -o requirements/pip-tools.txt requirements/pip-tools.in
 	pip install -qr requirements/pip-tools.txt
 	$(PIP_COMPILE) -o requirements/base.txt requirements/base.in
 	$(PIP_COMPILE) -o requirements/test.txt requirements/test.in
@@ -51,9 +49,8 @@ compile-requirements: ## compile the requirements/*.txt files with the latest pa
 	sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp
 	mv requirements/test.tmp requirements/test.txt
 
-upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
-	pip install -qr requirements/pip-tools.txt
-	$(MAKE) compile-requirements COMPILE_OPTS="--upgrade"
+upgrade: piptools ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
+	$(MAKE) compile-requirements PIP_COMPILE_OPTS="--upgrade"
 
 quality: ## check coding style with pycodestyle and pylint
 	tox -e quality
@@ -62,8 +59,7 @@ pii_check: ## check for PII annotations on all Django models
 	tox -e pii_check
 
 piptools: ## install pinned version of pip-compile and pip-sync
-	pip install -r requirements/pip.txt
-	pip install -r requirements/pip-tools.txt
+	# pip install -r requirements/pip-tools.txt
 
 requirements: clean_tox piptools ## install development environment requirements
 	pip-sync -q requirements/dev.txt requirements/private.*

backend/requirements/base.txt

@@ -1,20 +1,20 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --output-file=requirements/base.txt requirements/base.in
+#    make upgrade
 #
-asgiref==3.9.1
+asgiref==3.11.0
     # via django
-attrs==25.3.0
+attrs==25.4.0
     # via openedx-events
-cffi==1.17.1
+cffi==2.0.0
     # via pynacl
-click==8.2.1
+click==8.3.1
     # via edx-django-utils
-django==4.2.23
+django==5.2.9
     # via
-    #   -c https:/raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/base.in
     #   django-crum
     #   django-filter
@@ -25,51 +25,49 @@ django==4.2.23
     #   openedx-filters
 django-crum==0.7.9
     # via edx-django-utils
-django-filter==25.1
+django-filter==25.2
     # via -r requirements/base.in
 django-waffle==5.0.0
     # via edx-django-utils
 djangorestframework==3.16.1
     # via -r requirements/base.in
-dnspython==2.7.0
+dnspython==2.8.0
     # via pymongo
 edx-ccx-keys==2.0.2
     # via openedx-events
-edx-django-utils==8.0.0
+edx-django-utils==8.0.1
     # via openedx-events
 edx-opaque-keys[django]==3.0.0
     # via
     #   -r requirements/base.in
     #   edx-ccx-keys
     #   openedx-events
     #   openedx-filters
-fastavro==1.12.0
+fastavro==1.12.1
     # via openedx-events
 openedx-atlas==0.7.0
     # via -r requirements/base.in
 openedx-events==10.5.0
     # via -r requirements/base.in
 openedx-filters==2.1.0
     # via -r requirements/base.in
-pbr==7.0.1
-    # via stevedore
-psutil==7.0.0
+psutil==7.1.3
     # via edx-django-utils
-pycparser==2.22
+pycparser==2.23
     # via cffi
-pymongo==4.14.1
+pymongo==4.15.5
     # via edx-opaque-keys
-pynacl==1.5.0
+pynacl==1.6.1
     # via edx-django-utils
 six==1.17.0
     # via edx-ccx-keys
-sqlparse==0.5.3
+sqlparse==0.5.5
     # via django
-stevedore==5.4.1
+stevedore==5.6.0
     # via
     #   edx-django-utils
     #   edx-opaque-keys
-typing-extensions==4.14.1
+typing-extensions==4.15.0
     # via edx-opaque-keys
 
 # The following packages are considered to be unsafe in a requirements file:

backend/requirements/ci.txt

@@ -1,34 +1,34 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --output-file=requirements/ci.txt requirements/ci.in
+#    make upgrade
 #
-cachetools==6.1.0
+cachetools==6.2.4
     # via tox
 chardet==5.2.0
     # via tox
 colorama==0.4.6
     # via tox
 distlib==0.4.0
     # via virtualenv
-filelock==3.19.1
+filelock==3.20.1
     # via
     #   tox
     #   virtualenv
 packaging==25.0
     # via
     #   pyproject-api
     #   tox
-platformdirs==4.3.8
+platformdirs==4.5.1
     # via
     #   tox
     #   virtualenv
 pluggy==1.6.0
     # via tox
-pyproject-api==1.9.1
+pyproject-api==1.10.0
     # via tox
-tox==4.28.4
+tox==4.32.0
     # via -r requirements/ci.in
-virtualenv==20.34.0
+virtualenv==20.35.4
     # via tox