diff --git a/Makefile b/Makefile index 00f4ca9..118bc29 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ $(COMMON_CONSTRAINTS_TXT): 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 -qr requirements/pip-tools.txt - # Make sure to compile files after any other files they include! + pip install -qr requirements/pip.txt 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 diff --git a/requirements/ci.txt b/requirements/ci.txt index 6555e14..3796038 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -28,7 +28,7 @@ pluggy==1.6.0 # via tox pyproject-api==1.10.0 # via tox -tox==4.31.0 +tox==4.32.0 # via -r requirements/ci.in -virtualenv==20.35.3 +virtualenv==20.35.4 # via tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 00fcbd6..7dadc02 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -12,9 +12,16 @@ # 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 + +# pip 25.3 is incompatible with pip-tools hence causing failures during the build process +# Make upgrade command and all requirements upgrade jobs are broken due to this. +# See issue https://github.com/openedx/public-engineering/issues/440 for details regarding the ongoing fix. +# The constraint can be removed once a release (pip-tools > 7.5.1) is available with support for pip 25.3 +# Issue to track this dependency and unpin later on: https://github.com/openedx/edx-lint/issues/503 +pip<25.3 diff --git a/requirements/dev.txt b/requirements/dev.txt index de6ac90..6591c43 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -46,7 +46,7 @@ colorama==0.4.6 # via # -r requirements/ci.txt # tox -coverage[toml]==7.11.0 +coverage[toml]==7.11.3 # via # -r requirements/quality.txt # pytest-cov @@ -60,7 +60,7 @@ distlib==0.4.0 # via # -r requirements/ci.txt # virtualenv -django==4.2.25 +django==5.2.8 # via # -c requirements/common_constraints.txt # -r requirements/quality.txt @@ -158,7 +158,7 @@ pyproject-hooks==1.2.0 # -r requirements/pip-tools.txt # build # pip-tools -pytest==8.4.2 +pytest==9.0.0 # via # -r requirements/quality.txt # pytest-cov @@ -196,9 +196,9 @@ tomlkit==0.13.3 # via # -r requirements/quality.txt # pylint -tox==4.31.0 +tox==4.32.0 # via -r requirements/ci.txt -virtualenv==20.35.3 +virtualenv==20.35.4 # via # -r requirements/ci.txt # tox diff --git a/requirements/django.txt b/requirements/django.txt index 17401c8..c5b9dc5 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -6,7 +6,7 @@ # asgiref==3.10.0 # via django -django==4.2.25 +django==5.2.8 # via # -c requirements/common_constraints.txt # -r requirements/django.in diff --git a/requirements/doc.txt b/requirements/doc.txt index 1750b5e..84e573a 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -28,13 +28,13 @@ charset-normalizer==3.4.4 # via requests click==8.3.0 # via -r requirements/test.txt -coverage[toml]==7.11.0 +coverage[toml]==7.11.3 # via # -r requirements/test.txt # pytest-cov cryptography==46.0.3 # via secretstorage -django==4.2.25 +django==5.2.8 # via # -c requirements/common_constraints.txt # -r requirements/test.txt @@ -89,7 +89,7 @@ more-itertools==10.8.0 # via # jaraco-classes # jaraco-functools -nh3==0.3.1 +nh3==0.3.2 # via readme-renderer packaging==25.0 # via @@ -117,7 +117,7 @@ pygments==2.19.2 # readme-renderer # rich # sphinx -pytest==8.4.2 +pytest==9.0.0 # via # -r requirements/test.txt # pytest-cov diff --git a/requirements/pip.txt b/requirements/pip.txt index dec1587..c6158d3 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -9,6 +9,8 @@ wheel==0.45.1 # The following packages are considered to be unsafe in a requirements file: pip==25.2 - # via -r requirements/pip.in + # via + # -c requirements/common_constraints.txt + # -r requirements/pip.in setuptools==80.9.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 1d7d7b9..058d756 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -22,13 +22,13 @@ click-log==0.4.0 # via edx-lint code-annotations==2.3.0 # via edx-lint -coverage[toml]==7.11.0 +coverage[toml]==7.11.3 # via # -r requirements/test.txt # pytest-cov dill==0.4.0 # via pylint -django==4.2.25 +django==5.2.8 # via # -c requirements/common_constraints.txt # -r requirements/test.txt @@ -87,7 +87,7 @@ pylint-plugin-utils==0.9.0 # via # pylint-celery # pylint-django -pytest==8.4.2 +pytest==9.0.0 # via # -r requirements/test.txt # pytest-cov diff --git a/requirements/test.txt b/requirements/test.txt index 1893910..7f8d6f9 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -10,7 +10,7 @@ asgiref==3.10.0 # django click==8.3.0 # via -r requirements/base.txt -coverage[toml]==7.11.0 +coverage[toml]==7.11.3 # via pytest-cov # via # -c requirements/common_constraints.txt @@ -33,7 +33,7 @@ pluggy==1.6.0 # pytest-cov pygments==2.19.2 # via pytest -pytest==8.4.2 +pytest==9.0.0 # via pytest-cov pytest-cov==7.0.0 # via -r requirements/test.in