From 3e4692d3dfef3bd1f1c0c38a284bc9b3de0d7fd5 Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Thu, 21 Mar 2024 14:06:35 -0400 Subject: [PATCH] chore: Updating Python Requirements (#2411) --- requirements/all.txt | 25 +++++++++++++------------ requirements/base.txt | 19 +++++++++++-------- requirements/common_constraints.txt | 9 +++++++++ requirements/dev.txt | 19 ++++++++++--------- requirements/docs.txt | 8 +++++--- requirements/pip.txt | 2 +- requirements/pip_tools.txt | 8 +++++--- requirements/production.txt | 19 ++++++++++--------- requirements/test.txt | 19 ++++++++++--------- 9 files changed, 74 insertions(+), 54 deletions(-) diff --git a/requirements/all.txt b/requirements/all.txt index ebdce081e..87e5f17cf 100644 --- a/requirements/all.txt +++ b/requirements/all.txt @@ -33,21 +33,22 @@ backports-zoneinfo==0.2.1 # -r requirements/dev.txt # -r requirements/production.txt # django + # djangorestframework bcrypt==4.1.2 # via # -r requirements/dev.txt # paramiko -black==24.2.0 +black==24.3.0 # via -r requirements/dev.txt bleach==6.1.0 # via # -r requirements/dev.txt # -r requirements/production.txt -boto3==1.34.60 +boto3==1.34.65 # via # -r requirements/production.txt # django-ses -botocore==1.34.60 +botocore==1.34.65 # via # -r requirements/production.txt # boto3 @@ -89,7 +90,7 @@ click-log==0.4.0 # via # -r requirements/dev.txt # edx-lint -code-annotations==1.6.0 +code-annotations==1.7.0 # via # -r requirements/dev.txt # -r requirements/production.txt @@ -110,7 +111,7 @@ coreschema==0.0.4 # -r requirements/dev.txt # -r requirements/production.txt # coreapi -coverage==7.4.3 +coverage==7.4.4 # via -r requirements/dev.txt cryptography==42.0.5 # via @@ -236,7 +237,7 @@ django-webpack-loader==3.0.1 # via # -r requirements/dev.txt # -r requirements/production.txt -djangorestframework==3.14.0 +djangorestframework==3.15.0 # via # -r requirements/dev.txt # -r requirements/production.txt @@ -332,7 +333,7 @@ exceptiongroup==1.2.0 # pytest factory-boy==3.3.0 # via -r requirements/dev.txt -faker==24.1.0 +faker==24.3.0 # via # -r requirements/dev.txt # factory-boy @@ -361,8 +362,9 @@ idna==3.6 # -r requirements/dev.txt # -r requirements/production.txt # requests -importlib-metadata==7.0.2 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # -r requirements/dev.txt # -r requirements/production.txt # markdown @@ -404,7 +406,7 @@ lxml==5.1.0 # -r requirements/dev.txt # -r requirements/production.txt # edx-i18n-tools -markdown==3.5.2 +markdown==3.6 # via # -r requirements/dev.txt # -r requirements/production.txt @@ -611,7 +613,6 @@ pytz==2024.1 # -r requirements/dev.txt # -r requirements/production.txt # django-ses - # djangorestframework # drf-yasg pywatchman==2.0.0 ; "linux" in sys_platform # via -r requirements/dev.txt @@ -652,7 +653,7 @@ requests-oauthlib==1.4.0 # social-auth-core responses==0.25.0 # via -r requirements/dev.txt -s3transfer==0.10.0 +s3transfer==0.10.1 # via # -r requirements/production.txt # boto3 @@ -787,7 +788,7 @@ xss-utils==0.5.0 # via # -r requirements/dev.txt # -r requirements/production.txt -zipp==3.17.0 +zipp==3.18.1 # via # -r requirements/dev.txt # -r requirements/production.txt diff --git a/requirements/base.txt b/requirements/base.txt index 55dbc56e9..4dec76045 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -16,7 +16,9 @@ attrs==23.2.0 backoff==2.2.1 # via segment-analytics-python backports-zoneinfo==0.2.1 - # via django + # via + # django + # djangorestframework bleach==6.1.0 # via -r requirements/base.in certifi==2024.2.2 @@ -31,7 +33,7 @@ click==8.1.7 # via # code-annotations # edx-django-utils -code-annotations==1.6.0 +code-annotations==1.7.0 # via edx-toggles coreapi==2.3.3 # via @@ -110,7 +112,7 @@ django-waffle==4.1.0 # edx-toggles django-webpack-loader==3.0.1 # via -r requirements/base.in -djangorestframework==3.14.0 +djangorestframework==3.15.0 # via # -r requirements/base.in # django-rest-swagger @@ -160,8 +162,10 @@ fastavro==1.9.4 # via openedx-events idna==3.6 # via requests -importlib-metadata==7.0.2 - # via markdown +importlib-metadata==6.11.0 + # via + # -c requirements/common_constraints.txt + # markdown inflection==0.5.1 # via drf-yasg itypes==1.2.0 @@ -172,7 +176,7 @@ jinja2==3.1.3 # coreschema lxml==5.1.0 # via edx-i18n-tools -markdown==3.5.2 +markdown==3.6 # via -r requirements/base.in markupsafe==2.1.5 # via jinja2 @@ -237,7 +241,6 @@ python3-openid==3.2.0 pytz==2024.1 # via # -r requirements/base.in - # djangorestframework # drf-yasg pyyaml==5.4.1 # via @@ -315,5 +318,5 @@ webencodings==0.5.1 # via bleach xss-utils==0.5.0 # via -r requirements/base.in -zipp==3.17.0 +zipp==3.18.1 # via importlib-metadata diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 783d88bac..397652e03 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -25,3 +25,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/dev.txt b/requirements/dev.txt index ed5449b09..c855a2025 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -29,9 +29,10 @@ backports-zoneinfo==0.2.1 # via # -r requirements/test.txt # django + # djangorestframework bcrypt==4.1.2 # via paramiko -black==24.2.0 +black==24.3.0 # via -r requirements/test.txt bleach==6.1.0 # via -r requirements/test.txt @@ -68,7 +69,7 @@ click-log==0.4.0 # via # -r requirements/test.txt # edx-lint -code-annotations==1.6.0 +code-annotations==1.7.0 # via # -r requirements/test.txt # edx-lint @@ -86,7 +87,7 @@ coreschema==0.0.4 # via # -r requirements/test.txt # coreapi -coverage==7.4.3 +coverage==7.4.4 # via -r requirements/test.txt cryptography==42.0.5 # via @@ -179,7 +180,7 @@ django-waffle==4.1.0 # edx-toggles django-webpack-loader==3.0.1 # via -r requirements/test.txt -djangorestframework==3.14.0 +djangorestframework==3.15.0 # via # -r requirements/test.txt # django-rest-swagger @@ -246,7 +247,7 @@ exceptiongroup==1.2.0 # pytest factory-boy==3.3.0 # via -r requirements/test.txt -faker==24.1.0 +faker==24.3.0 # via # -r requirements/test.txt # factory-boy @@ -265,8 +266,9 @@ idna==3.6 # via # -r requirements/test.txt # requests -importlib-metadata==7.0.2 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # -r requirements/test.txt # markdown inflection==0.5.1 @@ -296,7 +298,7 @@ lxml==5.1.0 # via # -r requirements/test.txt # edx-i18n-tools -markdown==3.5.2 +markdown==3.6 # via -r requirements/test.txt markupsafe==2.1.5 # via @@ -459,7 +461,6 @@ python3-openid==3.2.0 pytz==2024.1 # via # -r requirements/test.txt - # djangorestframework # drf-yasg pywatchman==2.0.0 ; "linux" in sys_platform # via -r requirements/dev.in @@ -603,7 +604,7 @@ websocket-client==0.59.0 # via docker-compose xss-utils==0.5.0 # via -r requirements/test.txt -zipp==3.17.0 +zipp==3.18.1 # via # -r requirements/test.txt # importlib-metadata diff --git a/requirements/docs.txt b/requirements/docs.txt index 328943c6a..4a21beeef 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -26,8 +26,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 jinja2==3.1.3 # via sphinx jsx-lexer==2.0.1 @@ -79,5 +81,5 @@ urllib3==1.26.18 # via # -c requirements/constraints.txt # requests -zipp==3.17.0 +zipp==3.18.1 # via importlib-metadata diff --git a/requirements/pip.txt b/requirements/pip.txt index 0094cc686..cf449024a 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,5 +10,5 @@ wheel==0.43.0 # 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/pip_tools.txt b/requirements/pip_tools.txt index 3402e40f7..3db2d4cb8 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 @@ -25,7 +27,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/production.txt b/requirements/production.txt index b6e264ca6..ce3d33442 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -23,11 +23,12 @@ backports-zoneinfo==0.2.1 # via # -r requirements/base.txt # django + # djangorestframework bleach==6.1.0 # via -r requirements/base.txt -boto3==1.34.60 +boto3==1.34.65 # via django-ses -botocore==1.34.60 +botocore==1.34.65 # via # boto3 # s3transfer @@ -49,7 +50,7 @@ click==8.1.7 # -r requirements/base.txt # code-annotations # edx-django-utils -code-annotations==1.6.0 +code-annotations==1.7.0 # via # -r requirements/base.txt # edx-toggles @@ -140,7 +141,7 @@ django-waffle==4.1.0 # edx-toggles django-webpack-loader==3.0.1 # via -r requirements/base.txt -djangorestframework==3.14.0 +djangorestframework==3.15.0 # via # -r requirements/base.txt # django-rest-swagger @@ -204,8 +205,9 @@ idna==3.6 # via # -r requirements/base.txt # requests -importlib-metadata==7.0.2 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # -r requirements/base.txt # markdown inflection==0.5.1 @@ -229,7 +231,7 @@ lxml==5.1.0 # via # -r requirements/base.txt # edx-i18n-tools -markdown==3.5.2 +markdown==3.6 # via -r requirements/base.txt markupsafe==2.1.5 # via @@ -331,7 +333,6 @@ pytz==2024.1 # via # -r requirements/base.txt # django-ses - # djangorestframework # drf-yasg pyyaml==5.4.1 # via @@ -359,7 +360,7 @@ requests-oauthlib==1.4.0 # via # -r requirements/base.txt # social-auth-core -s3transfer==0.10.0 +s3transfer==0.10.1 # via boto3 sailthru-client==2.2.3 # via @@ -435,7 +436,7 @@ webencodings==0.5.1 # bleach xss-utils==0.5.0 # via -r requirements/base.txt -zipp==3.17.0 +zipp==3.18.1 # via # -r requirements/base.txt # importlib-metadata diff --git a/requirements/test.txt b/requirements/test.txt index acd8da33a..5dd8f6889 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -27,7 +27,8 @@ backports-zoneinfo==0.2.1 # via # -r requirements/base.txt # django -black==24.2.0 + # djangorestframework +black==24.3.0 # via -r requirements/test.in bleach==6.1.0 # via -r requirements/base.txt @@ -58,7 +59,7 @@ 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 # -r requirements/base.txt # -r requirements/test.in @@ -75,7 +76,7 @@ coreschema==0.0.4 # via # -r requirements/base.txt # coreapi -coverage==7.4.3 +coverage==7.4.4 # via -r requirements/test.in cryptography==42.0.5 # via @@ -157,7 +158,7 @@ django-waffle==4.1.0 # edx-toggles django-webpack-loader==3.0.1 # via -r requirements/base.txt -djangorestframework==3.14.0 +djangorestframework==3.15.0 # via # -r requirements/base.txt # django-rest-swagger @@ -213,7 +214,7 @@ exceptiongroup==1.2.0 # via pytest factory-boy==3.3.0 # via -r requirements/test.in -faker==24.1.0 +faker==24.3.0 # via factory-boy fastavro==1.9.4 # via @@ -229,8 +230,9 @@ idna==3.6 # via # -r requirements/base.txt # requests -importlib-metadata==7.0.2 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # -r requirements/base.txt # markdown inflection==0.5.1 @@ -256,7 +258,7 @@ lxml==5.1.0 # via # -r requirements/base.txt # edx-i18n-tools -markdown==3.5.2 +markdown==3.6 # via -r requirements/base.txt markupsafe==2.1.5 # via @@ -395,7 +397,6 @@ python3-openid==3.2.0 pytz==2024.1 # via # -r requirements/base.txt - # djangorestframework # drf-yasg pyyaml==5.4.1 # via @@ -520,7 +521,7 @@ webencodings==0.5.1 # bleach xss-utils==0.5.0 # via -r requirements/base.txt -zipp==3.17.0 +zipp==3.18.1 # via # -r requirements/base.txt # importlib-metadata