From 2e57df44a085e402ed24861d51de9642591e7931 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 22 Dec 2025 13:47:24 -0500 Subject: [PATCH 1/2] build: Sync the pip and pip-tools text file. The two should be built in sync not in separate files. See https://github.com/openedx/edx-platform/pull/37636 for more details. --- Makefile | 4 +--- requirements/pip.in | 7 ------- requirements/pip.txt | 11 ----------- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 requirements/pip.in delete mode 100644 requirements/pip.txt diff --git a/Makefile b/Makefile index 62ae0952f..52de71799 100644 --- a/Makefile +++ b/Makefile @@ -27,9 +27,7 @@ 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 --annotation-style=line --upgrade -o requirements/pip.txt requirements/pip.in - pip-compile --annotation-style=line --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in - pip install -q -r requirements/pip.txt + pip-compile --allow-unsafe --rebuild --annotation-style=line --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in pip install -q -r requirements/pip_tools.txt pip-compile --annotation-style=line --upgrade -o requirements/tox.txt requirements/tox.in pip-compile --annotation-style=line --upgrade -o requirements/testing.txt requirements/testing.in diff --git a/requirements/pip.in b/requirements/pip.in deleted file mode 100644 index 715478cdc..000000000 --- a/requirements/pip.in +++ /dev/null @@ -1,7 +0,0 @@ --c constraints.txt -# Core dependencies for installing other packages - -pip -setuptools -wheel - diff --git a/requirements/pip.txt b/requirements/pip.txt deleted file mode 100644 index ea978bfb5..000000000 --- a/requirements/pip.txt +++ /dev/null @@ -1,11 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# make upgrade -# -wheel==0.45.1 # via -r requirements/pip.in - -# The following packages are considered to be unsafe in a requirements file: -pip==25.2 # via -r requirements/pip.in -setuptools==80.9.0 # via -r requirements/pip.in From 3c91d3a3f3251890b006952b136c78fb0a738b9a Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 22 Dec 2025 13:53:31 -0500 Subject: [PATCH 2/2] chore: Run `make upgrade` --- requirements/common_constraints.txt | 2 +- requirements/development.txt | 14 +++++++------- requirements/pip_tools.txt | 8 ++++---- requirements/sandbox.txt | 2 +- requirements/testing.txt | 12 ++++++------ requirements/tox.txt | 10 +++++----- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 00fcbd6de..72cc4cc87 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -12,7 +12,7 @@ # 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 diff --git a/requirements/development.txt b/requirements/development.txt index 3fcd43065..07c01a60b 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -4,19 +4,19 @@ # # make upgrade # -asgiref==3.10.0 # via -r requirements/testing.txt, django -astroid==4.0.1 # via -r requirements/testing.txt, pylint +asgiref==3.11.0 # via -r requirements/testing.txt, django +astroid==4.0.2 # via -r requirements/testing.txt, pylint dill==0.4.0 # via -r requirements/testing.txt, pylint -django==4.2.25 # via -c requirements/common_constraints.txt, -r requirements/testing.txt +django==5.2.9 # via -c requirements/common_constraints.txt, -r requirements/testing.txt iniconfig==2.3.0 # via -r requirements/testing.txt, pytest isort==7.0.0 # via -r requirements/testing.txt, pylint mccabe==0.7.0 # via -r requirements/testing.txt, pylint packaging==25.0 # via -r requirements/testing.txt, pytest -platformdirs==4.5.0 # via -r requirements/testing.txt, pylint +platformdirs==4.5.1 # via -r requirements/testing.txt, pylint pluggy==1.6.0 # via -r requirements/testing.txt, pytest pycodestyle==2.14.0 # via -r requirements/testing.txt pygments==2.19.2 # via -r requirements/testing.txt, pytest -pylint==4.0.1 # via -r requirements/testing.txt -pytest==8.4.2 # via -r requirements/testing.txt -sqlparse==0.5.3 # via -r requirements/testing.txt, django +pylint==4.0.4 # via -r requirements/testing.txt +pytest==9.0.2 # via -r requirements/testing.txt +sqlparse==0.5.5 # via -r requirements/testing.txt, django tomlkit==0.13.3 # via -r requirements/testing.txt, pylint diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 0fd11fe2d..3fb98cce8 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -5,12 +5,12 @@ # make upgrade # build==1.3.0 # via pip-tools -click==8.3.0 # via pip-tools +click==8.3.1 # via pip-tools packaging==25.0 # via build -pip-tools==7.5.1 # via -r requirements/pip_tools.in +pip-tools==7.5.2 # via -r requirements/pip_tools.in pyproject-hooks==1.2.0 # via build, pip-tools 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 diff --git a/requirements/sandbox.txt b/requirements/sandbox.txt index 1e9ed4f1d..3ea8fb644 100644 --- a/requirements/sandbox.txt +++ b/requirements/sandbox.txt @@ -4,5 +4,5 @@ # # make upgrade # -numpy==2.3.4 # via -r requirements/sandbox.in +numpy==2.4.0 # via -r requirements/sandbox.in six==1.17.0 # via -r requirements/sandbox.in diff --git a/requirements/testing.txt b/requirements/testing.txt index 03ab5671b..50c835cb3 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -4,18 +4,18 @@ # # make upgrade # -asgiref==3.10.0 # via django -astroid==4.0.1 # via pylint +asgiref==3.11.0 # via django +astroid==4.0.2 # via pylint dill==0.4.0 # via pylint iniconfig==2.3.0 # via pytest isort==7.0.0 # via -r requirements/testing.in, pylint mccabe==0.7.0 # via pylint packaging==25.0 # via pytest -platformdirs==4.5.0 # via pylint +platformdirs==4.5.1 # via pylint pluggy==1.6.0 # via pytest pycodestyle==2.14.0 # via -r requirements/testing.in pygments==2.19.2 # via pytest -pylint==4.0.1 # via -r requirements/testing.in -pytest==8.4.2 # via -r requirements/testing.in -sqlparse==0.5.3 # via django +pylint==4.0.4 # via -r requirements/testing.in +pytest==9.0.2 # via -r requirements/testing.in +sqlparse==0.5.5 # via django tomlkit==0.13.3 # via pylint diff --git a/requirements/tox.txt b/requirements/tox.txt index 90d96d69c..ff854a88c 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -4,14 +4,14 @@ # # make upgrade # -cachetools==6.2.1 # via tox +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.20.0 # via tox, virtualenv +filelock==3.20.1 # via tox, virtualenv packaging==25.0 # via pyproject-api, tox -platformdirs==4.5.0 # via tox, virtualenv +platformdirs==4.5.1 # via tox, virtualenv pluggy==1.6.0 # via tox pyproject-api==1.10.0 # via tox -tox==4.31.0 # via -r requirements/tox.in -virtualenv==20.35.3 # via tox +tox==4.32.0 # via -r requirements/tox.in +virtualenv==20.35.4 # via tox