fix: fix and correct make upgrade

.github/workflows/ci.yml

@@ -18,14 +18,14 @@ jobs:
         toxenv: [django52, django42, quality]
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: setup python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
 
-    - 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 requirements

.github/workflows/pypi-publish.yml

@@ -11,14 +11,14 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: setup python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.12
 
-      - 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

@@ -10,7 +10,7 @@ quality:
 	tox -e quality
 
 requirements:
-	pip install -qr requirements/pip.txt
+	pip install -qr requirements/pip-tools.txt
 	pip install -e .    # Install this package and its dependencies
 	pip install -r test-requirements.txt
 
@@ -24,9 +24,7 @@ upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
 upgrade: $(COMMON_CONSTRAINTS_TXT)
 	## update the requirements text files based on the requirements/*.in files
 	pip install -qr requirements/pip-tools.txt
-	pip-compile --upgrade --allow-unsafe --rebuild -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 --allow-unsafe -o requirements/base.txt requirements/base.in
 	pip-compile --upgrade -o test-requirements.txt requirements/test.in

requirements/base.txt

@@ -4,21 +4,21 @@
 #
 #    make upgrade
 #
-asgiref==3.9.1
+asgiref==3.11.0
     # via django
-certifi==2025.8.3
+certifi==2026.1.4
     # via requests
-cffi==1.17.1
+cffi==2.0.0
     # via
     #   cryptography
     #   pynacl
-charset-normalizer==3.4.3
+charset-normalizer==3.4.4
     # via requests
-click==8.2.1
+click==8.3.1
     # via edx-django-utils
-cryptography==45.0.6
+cryptography==46.0.3
     # via pyjwt
-django==4.2.23
+django==5.2.10
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
@@ -34,7 +34,7 @@ django-crum==0.7.9
     # via edx-django-utils
 django-model-utils==5.0.0
     # via -r requirements/base.in
-django-simple-history==3.10.1
+django-simple-history==3.11.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
@@ -47,47 +47,47 @@ djangorestframework==3.16.1
     #   -r requirements/base.in
     #   drf-jwt
     #   edx-drf-extensions
-dnspython==2.7.0
+dnspython==2.8.0
     # via pymongo
 drf-jwt==1.19.2
     # via edx-drf-extensions
-edx-django-utils==8.0.0
+edx-django-utils==8.0.1
     # via edx-drf-extensions
 edx-drf-extensions==10.6.0
     # via -r requirements/base.in
 edx-opaque-keys==3.0.0
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
-idna==3.10
+idna==3.11
     # via requests
-pillow==11.3.0
+pillow==12.1.0
     # via -r requirements/base.in
-psutil==7.0.0
+psutil==7.2.1
     # via edx-django-utils
-pycparser==2.22
+pycparser==2.23
     # via cffi
 pyjwt[crypto]==2.10.1
     # via
     #   drf-jwt
     #   edx-drf-extensions
-pymongo==4.14.1
+pymongo==4.16.0
     # via edx-opaque-keys
-pynacl==1.5.0
+pynacl==1.6.2
     # via edx-django-utils
 requests==2.32.5
     # via edx-drf-extensions
 semantic-version==2.10.0
     # via edx-drf-extensions
-sqlparse==0.5.3
+sqlparse==0.5.5
     # via django
-stevedore==5.5.0
+stevedore==5.6.0
     # via
     #   edx-django-utils
     #   edx-opaque-keys
 typing-extensions==4.15.0
     # via edx-opaque-keys
-urllib3==2.5.0
+urllib3==2.6.3
     # via requests
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/common_constraints.txt

@@ -12,13 +12,9 @@
 #  this file from Github directly. It does not require packaging in edx-lint.
 
 # using LTS django version
-Django<5.0
+Django<6.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
 # See https://github.com/openedx/edx-platform/issues/35126 for more info
 elasticsearch<7.14.0
-
-# Cause: https://github.com/openedx/edx-lint/issues/458
-# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved.
-pip<24.3

requirements/pip-tools.txt

@@ -4,13 +4,13 @@
 #
 #    make upgrade
 #
-build==1.3.0
+build==1.4.0
     # via pip-tools
-click==8.2.1
+click==8.3.1
     # via pip-tools
 packaging==25.0
     # via build
-pip-tools==7.5.0
+pip-tools==7.5.2
     # via -r requirements/pip-tools.in
 pyproject-hooks==1.2.0
     # via
@@ -20,5 +20,7 @@ wheel==0.45.1
     # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:
-# pip
-# setuptools
+pip==25.3
+    # via pip-tools
+setuptools==80.9.0
+    # via pip-tools