From f6d40a49fa4e3c1adc2db381836693a0fce2999f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20M=C3=A9ndez?= Date: Thu, 29 Jan 2026 15:38:01 -0600 Subject: [PATCH 1/2] fix: Fix Upgrade Python Requirements --- requirements/base.txt | 6 ++++-- requirements/ci.txt | 1 + requirements/constraints.txt | 5 ++++- requirements/dev.txt | 6 ++++-- requirements/doc.txt | 10 ++-------- requirements/pip-tools.txt | 9 ++++++--- requirements/pip.txt | 8 ++++++-- requirements/quality.txt | 3 ++- requirements/test.txt | 3 ++- 9 files changed, 31 insertions(+), 20 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index a3011807..b2672db9 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -18,7 +18,7 @@ cffi==2.0.0 # pynacl charset-normalizer==3.4.3 # via requests -click==8.3.0 +click==8.3.1 # via # -c requirements/constraints.txt # edx-django-utils @@ -75,7 +75,9 @@ inflection==0.5.1 openedx-atlas==0.7.0 # via -r requirements/base.in packaging==25.0 - # via drf-yasg + # via + # -c requirements/constraints.txt + # drf-yasg psutil==7.1.0 # via edx-django-utils pycasbin==2.2.0 diff --git a/requirements/ci.txt b/requirements/ci.txt index 236d83e6..8258230b 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -18,6 +18,7 @@ filelock==3.19.1 # virtualenv packaging==25.0 # via + # -c requirements/constraints.txt # pyproject-api # tox platformdirs==4.4.0 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index ea627da3..8e93026a 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -12,4 +12,7 @@ -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # Different packages want different versions of click, we force the most compatible one here -click==8.3.0 +click==8.3.1 + +# Latest version of wheel is requiring packaging==26.0, but other packages require packaging==25.0 +packaging==25.0 \ No newline at end of file diff --git a/requirements/dev.txt b/requirements/dev.txt index 2a523694..dfcf28b4 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -43,7 +43,7 @@ charset-normalizer==3.4.3 # via # -r requirements/quality.txt # requests -click==8.3.0 +click==8.3.1 # via # -c requirements/constraints.txt # -r requirements/pip-tools.txt @@ -187,6 +187,7 @@ openedx-atlas==0.7.0 # via -r requirements/quality.txt packaging==25.0 # via + # -c requirements/constraints.txt # -r requirements/ci.txt # -r requirements/pip-tools.txt # -r requirements/quality.txt @@ -195,6 +196,7 @@ packaging==25.0 # pyproject-api # pytest # tox + # wheel path==16.16.0 # via edx-i18n-tools pip-tools==7.5.2 @@ -358,7 +360,7 @@ virtualenv==20.34.0 # via # -r requirements/ci.txt # tox -wheel==0.45.1 +wheel==0.46.3 # via # -r requirements/pip-tools.txt # pip-tools diff --git a/requirements/doc.txt b/requirements/doc.txt index 195bf664..a374f0c5 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -39,7 +39,7 @@ charset-normalizer==3.4.3 # via # -r requirements/test.txt # requests -click==8.3.0 +click==8.3.1 # via # -c requirements/constraints.txt # -r requirements/test.txt @@ -55,7 +55,6 @@ cryptography==46.0.2 # via # -r requirements/test.txt # pyjwt - # secretstorage ddt==1.7.2 # via -r requirements/test.txt django==4.2.24 @@ -144,10 +143,6 @@ jaraco-context==6.0.1 # via keyring jaraco-functools==4.3.0 # via keyring -jeepney==0.9.0 - # via - # keyring - # secretstorage jinja2==3.1.6 # via # -r requirements/test.txt @@ -173,6 +168,7 @@ openedx-atlas==0.7.0 # via -r requirements/test.txt packaging==25.0 # via + # -c requirements/constraints.txt # -r requirements/test.txt # build # drf-yasg @@ -266,8 +262,6 @@ rich==14.1.0 # via twine roman-numerals-py==3.1.0 # via sphinx -secretstorage==3.4.0 - # via keyring semantic-version==2.10.0 # via # -r requirements/test.txt diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 4968ecf4..3ee5f4dc 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -6,19 +6,22 @@ # build==1.4.0 # via pip-tools -click==8.3.0 +click==8.3.1 # via # -c requirements/constraints.txt # pip-tools packaging==25.0 - # via build + # via + # -c requirements/constraints.txt + # build + # wheel pip-tools==7.5.2 # via -r requirements/pip-tools.in pyproject-hooks==1.2.0 # via # build # pip-tools -wheel==0.45.1 +wheel==0.46.3 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index 33896381..a9795ff9 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,15 @@ # # pip-compile --allow-unsafe --output-file=requirements/pip.txt requirements/pip.in # -wheel==0.45.1 +packaging==25.0 + # via + # -c requirements/constraints.txt + # wheel +wheel==0.46.3 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: pip==25.3 # via -r requirements/pip.in -setuptools==80.9.0 +setuptools==80.10.2 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index b5099f18..337ffe5b 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -29,7 +29,7 @@ charset-normalizer==3.4.3 # via # -r requirements/test.txt # requests -click==8.3.0 +click==8.3.1 # via # -c requirements/constraints.txt # -r requirements/test.txt @@ -138,6 +138,7 @@ openedx-atlas==0.7.0 # via -r requirements/test.txt packaging==25.0 # via + # -c requirements/constraints.txt # -r requirements/test.txt # drf-yasg # pytest diff --git a/requirements/test.txt b/requirements/test.txt index a25f479d..d5e76bff 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -25,7 +25,7 @@ charset-normalizer==3.4.3 # via # -r requirements/base.txt # requests -click==8.3.0 +click==8.3.1 # via # -c requirements/constraints.txt # -r requirements/base.txt @@ -111,6 +111,7 @@ openedx-atlas==0.7.0 # via -r requirements/base.txt packaging==25.0 # via + # -c requirements/constraints.txt # -r requirements/base.txt # drf-yasg # pytest From ef22469c884563f52716aa4f839d21d9269b9996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20M=C3=A9ndez?= Date: Thu, 29 Jan 2026 16:20:41 -0600 Subject: [PATCH 2/2] squash!: Correct comment on root cause --- requirements/constraints.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 8e93026a..7c1cd3dc 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -14,5 +14,5 @@ # Different packages want different versions of click, we force the most compatible one here click==8.3.1 -# Latest version of wheel is requiring packaging==26.0, but other packages require packaging==25.0 +# packaging 26.0 was recently released, and wheel requirements are resolving to packaging==26.0, but other packages require packaging==25.0 packaging==25.0 \ No newline at end of file