From ca118bd22378a46fc9eecfb0b38f285f33525666 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Thu, 14 Mar 2024 20:13:13 -0400 Subject: [PATCH] chore: Updating Python Requirements --- requirements/base.txt | 6 +++--- requirements/common_constraints.txt | 9 +++++++++ requirements/dev.txt | 17 +++++++++-------- requirements/doc.txt | 16 +++++++++------- requirements/pip-tools.txt | 10 ++++++---- requirements/pip.txt | 4 ++-- requirements/quality.txt | 10 +++++----- requirements/test.txt | 8 ++++---- 8 files changed, 47 insertions(+), 33 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index bbd10238..da3fa048 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -34,7 +34,7 @@ github-py @ git+https://github.com/ShineyDev/github.py.git@8e3514010eb35a91e012f # via -r requirements/github.in gitpython==3.1.42 # via pytest-repo-health -google-auth==2.28.1 +google-auth==2.28.2 # via # google-auth-oauthlib # gspread @@ -78,7 +78,7 @@ pytest==8.0.2 # pytest-repo-health pytest-aiohttp==1.0.5 # via pytest-repo-health -pytest-asyncio==0.23.5 +pytest-asyncio==0.23.5.post1 # via # -r requirements/base.in # pytest-aiohttp @@ -90,7 +90,7 @@ pyyaml==6.0.1 # pytest-repo-health requests==2.31.0 # via requests-oauthlib -requests-oauthlib==1.3.1 +requests-oauthlib==1.4.0 # via google-auth-oauthlib rsa==4.9 # via google-auth diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 0ab0ecd2..aaa125a7 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 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 3353eee3..23166ba2 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -70,7 +70,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 @@ -78,7 +78,7 @@ colorama==0.4.6 # via # -r requirements/ci.txt # tox -coverage[toml]==7.4.3 +coverage[toml]==7.4.4 # via # -r requirements/quality.txt # pytest-cov @@ -124,7 +124,7 @@ gitpython==3.1.42 # via # -r requirements/quality.txt # pytest-repo-health -google-auth==2.28.1 +google-auth==2.28.2 # via # -r requirements/quality.txt # google-auth-oauthlib @@ -142,8 +142,9 @@ idna==3.6 # -r requirements/quality.txt # requests # yarl -importlib-metadata==7.0.2 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # -r requirements/pip-tools.txt # build iniconfig==2.0.0 @@ -274,7 +275,7 @@ pytest-aiohttp==1.0.5 # via # -r requirements/quality.txt # pytest-repo-health -pytest-asyncio==0.23.5 +pytest-asyncio==0.23.5.post1 # via # -r requirements/quality.txt # pytest-aiohttp @@ -297,7 +298,7 @@ requests==2.31.0 # -r requirements/quality.txt # requests-oauthlib # responses -requests-oauthlib==1.3.1 +requests-oauthlib==1.4.0 # via # -r requirements/quality.txt # google-auth-oauthlib @@ -370,7 +371,7 @@ virtualenv==20.25.1 # via # -r requirements/ci.txt # tox -wheel==0.42.0 +wheel==0.43.0 # via # -r requirements/pip-tools.txt # pip-tools @@ -378,7 +379,7 @@ yarl==1.9.4 # via # -r requirements/quality.txt # aiohttp -zipp==3.17.0 +zipp==3.18.1 # via # -r requirements/pip-tools.txt # importlib-metadata diff --git a/requirements/doc.txt b/requirements/doc.txt index 8d0fac13..54125f3a 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -43,7 +43,7 @@ charset-normalizer==3.3.2 # via # -r requirements/test.txt # requests -coverage[toml]==7.4.3 +coverage[toml]==7.4.4 # via # -r requirements/test.txt # pytest-cov @@ -77,7 +77,7 @@ gitpython==3.1.42 # via # -r requirements/test.txt # pytest-repo-health -google-auth==2.28.1 +google-auth==2.28.2 # via # -r requirements/test.txt # google-auth-oauthlib @@ -97,8 +97,10 @@ idna==3.6 # yarl 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 iniconfig==2.0.0 # via # -r requirements/test.txt @@ -165,7 +167,7 @@ pytest-aiohttp==1.0.5 # via # -r requirements/test.txt # pytest-repo-health -pytest-asyncio==0.23.5 +pytest-asyncio==0.23.5.post1 # via # -r requirements/test.txt # pytest-aiohttp @@ -188,7 +190,7 @@ requests==2.31.0 # requests-oauthlib # responses # sphinx -requests-oauthlib==1.3.1 +requests-oauthlib==1.4.0 # via # -r requirements/test.txt # google-auth-oauthlib @@ -248,5 +250,5 @@ yarl==1.9.4 # via # -r requirements/test.txt # aiohttp -zipp==3.17.0 +zipp==3.18.1 # via importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 1ae42163..935644e4 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==21.3 # via # -c requirements/constraints.txt @@ -27,9 +29,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.1 # 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 66656035..cf449024 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # 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: pip==24.0 # via -r requirements/pip.in -setuptools==69.1.1 +setuptools==69.2.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index f7ce7800..2a0e38d3 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -50,9 +50,9 @@ click==8.1.7 # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==1.6.0 +code-annotations==1.7.0 # via edx-lint -coverage[toml]==7.4.3 +coverage[toml]==7.4.4 # via # -r requirements/test.txt # pytest-cov @@ -85,7 +85,7 @@ gitpython==3.1.42 # via # -r requirements/test.txt # pytest-repo-health -google-auth==2.28.1 +google-auth==2.28.2 # via # -r requirements/test.txt # google-auth-oauthlib @@ -182,7 +182,7 @@ pytest-aiohttp==1.0.5 # via # -r requirements/test.txt # pytest-repo-health -pytest-asyncio==0.23.5 +pytest-asyncio==0.23.5.post1 # via # -r requirements/test.txt # pytest-aiohttp @@ -203,7 +203,7 @@ requests==2.31.0 # -r requirements/test.txt # requests-oauthlib # responses -requests-oauthlib==1.3.1 +requests-oauthlib==1.4.0 # via # -r requirements/test.txt # google-auth-oauthlib diff --git a/requirements/test.txt b/requirements/test.txt index 5d436176..9b537393 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -33,7 +33,7 @@ charset-normalizer==3.3.2 # via # -r requirements/base.txt # requests -coverage[toml]==7.4.3 +coverage[toml]==7.4.4 # via pytest-cov dockerfile==3.3.1 # via -r requirements/base.txt @@ -56,7 +56,7 @@ gitpython==3.1.42 # via # -r requirements/base.txt # pytest-repo-health -google-auth==2.28.1 +google-auth==2.28.2 # via # -r requirements/base.txt # google-auth-oauthlib @@ -121,7 +121,7 @@ pytest-aiohttp==1.0.5 # via # -r requirements/base.txt # pytest-repo-health -pytest-asyncio==0.23.5 +pytest-asyncio==0.23.5.post1 # via # -r requirements/base.txt # pytest-aiohttp @@ -139,7 +139,7 @@ requests==2.31.0 # -r requirements/base.txt # requests-oauthlib # responses -requests-oauthlib==1.3.1 +requests-oauthlib==1.4.0 # via # -r requirements/base.txt # google-auth-oauthlib