From 0adfb63ec29e625c91743cff7a221b32da505b44 Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Fri, 22 Mar 2024 13:20:12 -0400 Subject: [PATCH] chore: Updating Python Requirements (#179) --- requirements/base.txt | 9 ++++----- requirements/common_constraints.txt | 9 +++++++++ requirements/dev.txt | 9 +++++---- requirements/doc.txt | 14 ++++++++------ requirements/pip-tools.txt | 8 +++++--- requirements/quality.txt | 9 +++++---- requirements/test.txt | 8 ++++---- 7 files changed, 40 insertions(+), 26 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 984013a..48c0ea9 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -12,6 +12,7 @@ backports-zoneinfo[tzdata]==0.2.1 # via # celery # django + # djangorestframework # kombu billiard==4.2.0 # via celery @@ -41,7 +42,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 @@ -81,7 +82,7 @@ django-waffle==4.1.0 # edx-django-utils # edx-drf-extensions # edx-toggles -djangorestframework==3.14.0 +djangorestframework==3.15.0 # via # -r requirements/base.in # django-config-models @@ -146,9 +147,7 @@ python-dateutil==2.9.0.post0 python-slugify==8.0.4 # via code-annotations pytz==2024.1 - # via - # djangorestframework - # drf-yasg + # via drf-yasg pyyaml==6.0.1 # via # code-annotations diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 6f2af3d..8b0c901 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -22,3 +22,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 58ed602..f29e07f 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -59,7 +59,7 @@ click-log==0.4.0 # via # -r requirements/quality.txt # edx-lint -code-annotations==1.6.0 +code-annotations==1.7.0 # via # -r requirements/quality.txt # edx-lint @@ -106,8 +106,9 @@ idna==3.6 # via # -r requirements/quality.txt # requests -importlib-metadata==7.0.2 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # -r requirements/pip-tools.txt # -r requirements/quality.txt # build @@ -115,7 +116,7 @@ importlib-metadata==7.0.2 # rstcheck # rstcheck-core # twine -importlib-resources==6.1.3 +importlib-resources==6.3.1 # via # -r requirements/quality.txt # keyring @@ -365,7 +366,7 @@ wheel==0.43.0 # via # -r requirements/pip-tools.txt # pip-tools -zipp==3.17.0 +zipp==3.18.1 # via # -r requirements/pip-tools.txt # -r requirements/quality.txt diff --git a/requirements/doc.txt b/requirements/doc.txt index a5430d4..d17d3c6 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -16,6 +16,7 @@ backports-zoneinfo[tzdata]==0.2.1 # via # celery # django + # djangorestframework # kombu billiard==4.2.0 # via celery @@ -45,7 +46,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 @@ -85,7 +86,7 @@ django-waffle==4.1.0 # edx-django-utils # edx-drf-extensions # edx-toggles -djangorestframework==3.14.0 +djangorestframework==3.15.0 # via # -r requirements/base.in # django-config-models @@ -127,8 +128,10 @@ idna==3.6 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==7.0.2 - # via sphinx +importlib-metadata==6.11.0 + # via + # -c requirements/common_constraints.txt + # sphinx inflection==0.5.1 # via drf-yasg jinja2==3.1.3 @@ -179,7 +182,6 @@ python-slugify==8.0.4 pytz==2024.1 # via # babel - # djangorestframework # drf-yasg pyyaml==6.0.1 # via @@ -253,5 +255,5 @@ vine==5.1.0 # kombu wcwidth==0.2.13 # via prompt-toolkit -zipp==3.17.0 +zipp==3.18.1 # via importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index ffc972f..036969d 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -8,8 +8,10 @@ build==1.1.1 # via pip-tools click==8.1.7 # via 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 @@ wheel==0.43.0 # via # -r requirements/pip-tools.in # 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 8556f3f..966a083 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -28,7 +28,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 @@ -48,13 +48,14 @@ edx-lint==5.3.6 # via -r requirements/quality.in idna==3.6 # via requests -importlib-metadata==7.0.2 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # keyring # rstcheck # rstcheck-core # twine -importlib-resources==6.1.3 +importlib-resources==6.3.1 # via keyring isort==5.13.2 # via @@ -176,7 +177,7 @@ urllib3==2.2.1 # via # requests # twine -zipp==3.17.0 +zipp==3.18.1 # via # importlib-metadata # importlib-resources diff --git a/requirements/test.txt b/requirements/test.txt index a350a67..c516425 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -16,6 +16,7 @@ backports-zoneinfo[tzdata]==0.2.1 # -r requirements/base.txt # celery # django + # djangorestframework # kombu # via # -r requirements/base.txt @@ -58,12 +59,12 @@ click-repl==0.3.0 # via # -r requirements/base.txt # celery -code-annotations==1.6.0 +code-annotations==1.7.0 # via # -r requirements/base.txt # -r requirements/test.in # edx-toggles -coverage[toml]==7.4.3 +coverage[toml]==7.4.4 # via pytest-cov cryptography==42.0.5 # via @@ -108,7 +109,7 @@ django-waffle==4.1.0 # edx-django-utils # edx-drf-extensions # edx-toggles -djangorestframework==3.14.0 +djangorestframework==3.15.0 # via # -r requirements/base.txt # django-config-models @@ -230,7 +231,6 @@ python-slugify==8.0.4 pytz==2024.1 # via # -r requirements/base.txt - # djangorestframework # drf-yasg pyyaml==6.0.1 # via