fix: fix and correct make upgrade

.github/workflows/ci.yml

@@ -28,8 +28,8 @@ jobs:
       with:
         mongodb-version: 4.0
 
-    - name: Install pip
-      run: pip install -r requirements/pip.txt
+    - name: Install pip and pip-tools
+      run: pip install -r requirements/pip-tools.txt
 
     - name: Install Dependencies
       run: make test.setup install

.github/workflows/pypi-publish.yml

@@ -17,8 +17,8 @@ jobs:
         with:
           python-version: 3.11
 
-      - name: Install pip
-        run: pip install -r requirements/pip.txt
+      - name: Install pip and pip-tools
+        run: pip install -r requirements/pip-tools.txt
 
       - name: Install Dependencies
         run: pip install setuptools wheel

Makefile

@@ -53,17 +53,14 @@ report: ## generate reports for quality checks and code coverage
 	coverage xml -o coverage.xml
 
 requirements: ## install development environment requirements
-	pip install -r requirements/pip.txt
 	pip install -r requirements/pip-tools.txt
 	pip-sync requirements/dev.txt requirements/private.*
 
 upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
 upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
 	pip install -qr requirements/pip-tools.txt
 	# Make sure to compile files after any other files they include!
-	pip-compile --upgrade --allow-unsafe -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-compile --upgrade --allow-unsafe -o requirements/pip-tools.txt requirements/pip-tools.in
 	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

requirements/base.txt

@@ -6,19 +6,19 @@
 #
 amqp==5.3.1
     # via kombu
-asgiref==3.10.0
+asgiref==3.11.0
     # via django
 attrs==25.4.0
     # via openedx-events
-billiard==4.2.2
+billiard==4.2.4
     # via celery
-celery==5.5.3
+celery==5.6.2
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
 cffi==2.0.0
     # via pynacl
-click==8.3.0
+click==8.3.1
     # via
     #   celery
     #   click-didyoumean
@@ -34,7 +34,7 @@ click-repl==0.3.0
     # via celery
 code-annotations==2.3.0
     # via edx-toggles
-django==4.2.25
+django==5.2.10
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/base.in
@@ -70,7 +70,7 @@ fastavro==1.12.1
     # via openedx-events
 jinja2==3.1.6
     # via code-annotations
-kombu==5.5.4
+kombu==5.6.2
     # via celery
 markupsafe==3.0.3
     # via jinja2
@@ -80,15 +80,15 @@ packaging==25.0
     # via kombu
 prompt-toolkit==3.0.52
     # via click-repl
-psutil==7.1.1
+psutil==7.2.1
     # via edx-django-utils
 pycparser==2.23
     # via cffi
-pymongo==4.15.3
+pymongo==4.16.0
     # via
     #   -r requirements/base.in
     #   edx-opaque-keys
-pynacl==1.6.0
+pynacl==1.6.2
     # via edx-django-utils
 python-dateutil==2.9.0.post0
     # via celery
@@ -103,9 +103,9 @@ six==1.17.0
     #   -r requirements/base.in
     #   edx-ccx-keys
     #   python-dateutil
-sqlparse==0.5.3
+sqlparse==0.5.5
     # via django
-stevedore==5.5.0
+stevedore==5.6.0
     # via
     #   code-annotations
     #   edx-django-utils
@@ -114,8 +114,10 @@ text-unidecode==1.3
     # via python-slugify
 typing-extensions==4.15.0
     # via edx-opaque-keys
-tzdata==2025.2
+tzdata==2025.3
     # via kombu
+tzlocal==5.3.1
+    # via celery
 vine==5.1.0
     # via
     #   amqp

requirements/celery54.txt

@@ -1,9 +1,9 @@
 amqp==5.3.1
-billiard==4.2.2
-celery==5.5.3
-click==8.3.0
+billiard==4.2.4
+celery==5.6.2
+click==8.3.1
 click-didyoumean==0.3.1
 click-repl==0.3.0
-kombu==5.5.4
+kombu==5.6.2
 prompt-toolkit==3.0.52
 vine==5.1.0

requirements/ci.txt

@@ -4,33 +4,33 @@
 #
 #    make upgrade
 #
-cachetools==6.2.1
+cachetools==6.2.4
     # via tox
 chardet==5.2.0
     # via tox
 colorama==0.4.6
     # via tox
-coverage==7.11.0
+coverage==7.13.1
     # via -r requirements/ci.in
 distlib==0.4.0
     # via virtualenv
-filelock==3.20.0
+filelock==3.20.3
     # via
     #   tox
     #   virtualenv
 packaging==25.0
     # via
     #   pyproject-api
     #   tox
-platformdirs==4.5.0
+platformdirs==4.5.1
     # via
     #   tox
     #   virtualenv
 pluggy==1.6.0
     # via tox
 pyproject-api==1.10.0
     # via tox
-tox==4.31.0
+tox==4.34.1
     # via -r requirements/ci.in
-virtualenv==20.35.3
+virtualenv==20.36.1
     # via tox