fix: fix and correct make upgrade

.github/workflows/pypi-publish.yml

@@ -11,14 +11,14 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: setup python
-        uses: actions/setup-python@v4
+        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: Build package
         run: python setup.py sdist bdist_wheel

Makefile

@@ -12,9 +12,7 @@ EXTRACTED_DJANGO := $(EXTRACT_DIR)/django.po
 upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
 upgrade: $(COMMON_CONSTRAINTS_TXT)  ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
 	pip install -q -r requirements/pip_tools.txt
-	pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in
-	pip-compile --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
-	pip install -q -r requirements/pip.txt
+	pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
 	pip install -q -r requirements/pip_tools.txt
 	pip-compile --upgrade -o requirements/base.txt requirements/base.in
 

requirements/base.txt

@@ -8,31 +8,31 @@ appdirs==1.4.4
     # via fs
 fs==2.4.16
     # via xblock
-lxml==5.3.0
+lxml==6.0.2
     # via xblock
-mako==1.3.5
+mako==1.3.10
     # via xblock
-markupsafe==2.1.5
+markupsafe==3.0.3
     # via
     #   mako
     #   xblock
 python-dateutil==2.9.0.post0
     # via xblock
-pytz==2024.1
+pytz==2025.2
     # via xblock
-pyyaml==6.0.2
+pyyaml==6.0.3
     # via xblock
-simplejson==3.19.3
+simplejson==3.20.2
     # via xblock
-six==1.16.0
+six==1.17.0
     # via
     #   fs
     #   python-dateutil
-web-fragments==2.2.0
+web-fragments==3.1.0
     # via xblock
-webob==1.8.8
+webob==1.8.9
     # via xblock
-xblock==5.1.0
+xblock==5.3.0
     # via -r requirements/base.in
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/common_constraints.txt

@@ -11,13 +11,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<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
-
-# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
-django-simple-history==3.0.0

requirements/pip_tools.txt

@@ -4,21 +4,23 @@
 #
 #    make upgrade
 #
-build==1.2.2
+build==1.4.0
     # via pip-tools
-click==8.1.7
+click==8.3.1
     # via pip-tools
-packaging==24.1
+packaging==25.0
     # via build
-pip-tools==7.4.1
+pip-tools==7.5.2
     # via -r requirements/pip_tools.in
-pyproject-hooks==1.1.0
+pyproject-hooks==1.2.0
     # via
     #   build
     #   pip-tools
-wheel==0.44.0
+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