diff --git a/requirements/ci.txt b/requirements/ci.txt index a6d254c..ef323a2 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -26,7 +26,7 @@ filelock==3.13.1 # virtualenv idna==3.6 # via requests -packaging==23.2 +packaging==24.0 # via # pyproject-api # tox @@ -44,7 +44,7 @@ tomli==2.0.1 # via # pyproject-api # tox -tox==4.13.0 +tox==4.14.1 # via -r requirements/ci.in urllib3==2.2.1 # via requests diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 15aafb2..e3bf8ea 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -13,7 +13,7 @@ # using LTS django version -Django<4.0 +Django<5.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 @@ -21,3 +21,12 @@ 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 + +# opentelemetry requires version 6.x at the moment: +# https://github.com/open-telemetry/opentelemetry-python/issues/3570 +# Normally this could be added as a constraint in edx-django-utils, where we're +# adding the opentelemetry dependency. However, when we compile pip-tools.txt, +# that uses version 7.x, and then there's no undoing that when compiling base.txt. +# So we need to pin it globally, for now. +# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407 +importlib-metadata<7 diff --git a/requirements/dev.txt b/requirements/dev.txt index 0efd200..b532db3 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -10,7 +10,9 @@ astroid==3.1.0 # via # pylint # pylint-celery -build==1.0.3 +backports-zoneinfo==0.2.1 + # via django +build==1.1.1 # via -r requirements/quality.in cachetools==5.3.3 # via tox @@ -43,7 +45,7 @@ dill==0.3.8 # via pylint distlib==0.3.8 # via virtualenv -django==3.2.24 +django==4.2.11 # via # -c requirements/common_constraints.txt # -r requirements/base.in @@ -62,12 +64,13 @@ filelock==3.13.1 # virtualenv idna==3.6 # via requests -importlib-metadata==7.0.1 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # build # keyring # twine -importlib-resources==6.1.2 +importlib-resources==6.3.0 # via keyring isort==5.13.2 # via @@ -99,7 +102,7 @@ more-itertools==10.2.0 # via jaraco-classes nh3==0.2.15 # via readme-renderer -packaging==23.2 +packaging==24.0 # via # build # pyproject-api @@ -108,7 +111,7 @@ path==16.10.0 # via edx-i18n-tools pbr==6.0.0 # via stevedore -pkginfo==1.9.6 +pkginfo==1.10.0 # via twine platformdirs==4.2.0 # via @@ -152,8 +155,6 @@ pyproject-hooks==1.0.0 # via build python-slugify==8.0.4 # via code-annotations -pytz==2024.1 - # via django pyyaml==6.0.1 # via # code-annotations @@ -168,7 +169,7 @@ requests-toolbelt==1.0.0 # via twine rfc3986==2.0.0 # via twine -rich==13.7.0 +rich==13.7.1 # via twine secretstorage==3.3.3 # via keyring @@ -189,7 +190,7 @@ tomli==2.0.1 # tox tomlkit==0.12.4 # via pylint -tox==4.13.0 +tox==4.14.1 # via -r requirements/dev.in twine==5.0.0 # via @@ -207,9 +208,9 @@ urllib3==2.2.1 # twine virtualenv==20.25.1 # via tox -wheel==0.42.0 +wheel==0.43.0 # via -r requirements/dev.in -zipp==3.17.0 +zipp==3.18.0 # via # importlib-metadata # importlib-resources diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 44c48d9..2836bbb 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,15 +4,17 @@ # # make upgrade # -build==1.0.3 +build==1.1.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==7.0.1 - # via build -packaging==23.2 +importlib-metadata==6.11.0 + # via + # -c requirements/common_constraints.txt + # build +packaging==24.0 # via build -pip-tools==7.4.0 +pip-tools==7.4.1 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 # via @@ -23,9 +25,9 @@ tomli==2.0.1 # build # pip-tools # pyproject-hooks -wheel==0.42.0 +wheel==0.43.0 # via pip-tools -zipp==3.17.0 +zipp==3.18.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index 6665603..0094cc6 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,7 +4,7 @@ # # make upgrade # -wheel==0.42.0 +wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/quality.txt b/requirements/quality.txt index e7c9ccd..d049047 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -8,7 +8,7 @@ astroid==3.1.0 # via # pylint # pylint-celery -build==1.0.3 +build==1.1.1 # via -r requirements/quality.in certifi==2024.2.2 # via requests @@ -35,12 +35,13 @@ edx-lint==5.3.6 # via -r requirements/quality.in idna==3.6 # via requests -importlib-metadata==7.0.1 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # build # keyring # twine -importlib-resources==6.1.2 +importlib-resources==6.3.0 # via keyring isort==5.13.2 # via @@ -68,11 +69,11 @@ more-itertools==10.2.0 # via jaraco-classes nh3==0.2.15 # via readme-renderer -packaging==23.2 +packaging==24.0 # via build pbr==6.0.0 # via stevedore -pkginfo==1.9.6 +pkginfo==1.10.0 # via twine platformdirs==4.2.0 # via pylint @@ -116,7 +117,7 @@ requests-toolbelt==1.0.0 # via twine rfc3986==2.0.0 # via twine -rich==13.7.0 +rich==13.7.1 # via twine secretstorage==3.3.3 # via keyring @@ -144,7 +145,7 @@ urllib3==2.2.1 # via # requests # twine -zipp==3.17.0 +zipp==3.18.0 # via # importlib-metadata # importlib-resources diff --git a/requirements/test.txt b/requirements/test.txt index 0b622da..79f8a15 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -6,6 +6,8 @@ # asgiref==3.7.2 # via django +backports-zoneinfo==0.2.1 + # via django coverage[toml]==7.4.3 # via pytest-cov # via @@ -18,13 +20,13 @@ exceptiongroup==1.2.0 # via pytest iniconfig==2.0.0 # via pytest -packaging==23.2 +packaging==24.0 # via pytest pluggy==1.4.0 # via pytest py==1.11.0 # via pytest-catchlog -pytest==8.0.2 +pytest==8.1.1 # via # pytest-catchlog # pytest-cov @@ -35,8 +37,6 @@ pytest-cov==4.1.0 # via -r requirements/test.in pytest-django==4.8.0 # via -r requirements/test.in -pytz==2024.1 - # via django pyyaml==6.0.1 # via edx-django-release-util six==1.16.0