diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 54348c7a58..4abc9ae22c 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -24,3 +24,12 @@ Django<5.0 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/constraints.txt b/requirements/constraints.txt index e4e65f93cc..43c339d72b 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -23,7 +23,7 @@ click>=8.0,<9.0 # The team that owns this package will manually bump this package rather than having it pulled in automatically. # This is to allow them to better control its deployment and to do it in a process that works better # for them. -edx-enterprise==4.13.5 +edx-enterprise==4.13.6 # Stay on LTS version, remove once this is added to common constraint Django<5.0 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 5faa3a21c1..4a03a76e58 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -477,7 +477,7 @@ edx-drf-extensions==10.2.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.13.5 +edx-enterprise==4.13.6 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in @@ -607,8 +607,10 @@ idna==3.6 # requests # snowflake-connector-python # yarl -importlib-metadata==7.0.1 - # via markdown +importlib-metadata==6.11.0 + # via + # -c requirements/edx/../common_constraints.txt + # markdown importlib-resources==5.13.0 # via # jsonschema diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 2ffa536f28..4a1c41a2c2 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -751,7 +751,7 @@ edx-drf-extensions==10.2.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.13.5 +edx-enterprise==4.13.6 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt @@ -993,8 +993,9 @@ imagesize==1.4.1 # sphinx import-linter==2.0 # via -r requirements/edx/testing.txt -importlib-metadata==7.0.1 +importlib-metadata==6.11.0 # via + # -c requirements/edx/../common_constraints.txt # -r requirements/edx/../pip-tools.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index c31210d1aa..7e2627406f 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -551,7 +551,7 @@ edx-drf-extensions==10.2.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.13.5 +edx-enterprise==4.13.6 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt @@ -700,8 +700,9 @@ idna==3.6 # yarl imagesize==1.4.1 # via sphinx -importlib-metadata==7.0.1 +importlib-metadata==6.11.0 # via + # -c requirements/edx/../common_constraints.txt # -r requirements/edx/base.txt # markdown # sphinx diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 5197b29231..49300578d3 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -577,7 +577,7 @@ edx-drf-extensions==10.2.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.13.5 +edx-enterprise==4.13.6 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt @@ -747,8 +747,9 @@ idna==3.6 # yarl import-linter==2.0 # via -r requirements/edx/testing.in -importlib-metadata==7.0.1 +importlib-metadata==6.11.0 # via + # -c requirements/edx/../common_constraints.txt # -r requirements/edx/base.txt # markdown # pytest-randomly diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 309aa42bc0..d258b485d0 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -10,8 +10,10 @@ click==8.1.6 # via # -c requirements/constraints.txt # pip-tools -importlib-metadata==7.0.1 - # via build +importlib-metadata==6.11.0 + # via + # -c requirements/common_constraints.txt + # build packaging==23.2 # via build pip-tools==7.4.0