diff --git a/requirements/base.txt b/requirements/base.txt index 365a8fa7e1..6910d436fb 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -16,6 +16,7 @@ backports-zoneinfo[tzdata]==0.2.1 # via # celery # django + # djangorestframework # kombu billiard==4.2.0 # via celery @@ -46,7 +47,7 @@ click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -code-annotations==1.6.0 +code-annotations==1.7.0 # via edx-toggles cryptography==42.0.5 # via pyjwt @@ -91,7 +92,7 @@ django-webpack-loader==0.7.0 # via # -c requirements/constraints.txt # -r requirements/base.in -djangorestframework==3.14.0 +djangorestframework==3.15.0 # via # -r requirements/base.in # drf-jwt @@ -183,7 +184,6 @@ python-slugify==8.0.4 pytz==2024.1 # via # -r requirements/base.in - # djangorestframework # event-tracking # xblock pyyaml==6.0.1 diff --git a/requirements/ci.txt b/requirements/ci.txt index db3980cce7..5c7fe04a7d 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -10,7 +10,7 @@ chardet==5.2.0 # via tox colorama==0.4.6 # via tox -coverage==7.4.3 +coverage==7.4.4 # via -r requirements/ci.in distlib==0.3.8 # via virtualenv diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 1f68538a77..2b6d23d193 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -26,3 +26,12 @@ elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected + +# 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 cd42e951d5..e8508804de 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -29,7 +29,7 @@ click==8.1.7 # typer click-log==0.4.0 # via edx-lint -code-annotations==1.6.0 +code-annotations==1.7.0 # via edx-lint colorama==0.4.6 # via @@ -59,8 +59,9 @@ filelock==3.13.1 # via # tox # virtualenv -importlib-metadata==7.0.2 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # rstcheck # rstcheck-core isort==5.13.2 @@ -183,5 +184,5 @@ virtualenv==20.25.1 # via tox wheel==0.43.0 # via -r requirements/dev.in -zipp==3.17.0 +zipp==3.18.1 # via importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 5760df73fc..9b3d869230 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -10,8 +10,10 @@ click==8.1.7 # via # -c requirements/constraints.txt # pip-tools -importlib-metadata==7.0.2 - # via build +importlib-metadata==6.11.0 + # via + # -c requirements/common_constraints.txt + # build packaging==24.0 # via build pip-tools==7.4.1 @@ -27,7 +29,7 @@ tomli==2.0.1 # pyproject-hooks wheel==0.43.0 # via pip-tools -zipp==3.17.0 +zipp==3.18.1 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/quality.txt b/requirements/quality.txt index dee321daec..222e32737f 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -23,7 +23,7 @@ click==8.1.7 # typer click-log==0.4.0 # via edx-lint -code-annotations==1.6.0 +code-annotations==1.7.0 # via edx-lint colorama==0.4.6 # via typer @@ -37,8 +37,9 @@ docutils==0.20.1 # via rstcheck-core edx-lint==5.3.6 # via -r requirements/quality.in -importlib-metadata==7.0.2 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # rstcheck # rstcheck-core isort==5.13.2 @@ -123,5 +124,5 @@ typing-extensions==4.10.0 # rstcheck # rstcheck-core # typer -zipp==3.17.0 +zipp==3.18.1 # via importlib-metadata diff --git a/requirements/test.txt b/requirements/test.txt index 56f7ac6d60..b8220368f3 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -15,6 +15,7 @@ backports-zoneinfo[tzdata]==0.2.1 # via # celery # django + # djangorestframework # kombu # via celery # via @@ -40,11 +41,11 @@ charset-normalizer==3.3.2 click-plugins==1.1.1 # via celery # via celery -code-annotations==1.6.0 +code-annotations==1.7.0 # via # -r requirements/test.in # edx-toggles -coverage[toml]==7.4.3 +coverage[toml]==7.4.4 # via pytest-cov cryptography==42.0.5 # via pyjwt @@ -218,7 +219,6 @@ python-slugify==8.0.4 pytz==2024.1 # via # -r requirements/base.in - # djangorestframework # event-tracking # xblock pyyaml==6.0.1