diff --git a/requirements/base.txt b/requirements/base.txt index 80095291..16deef4a 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,7 +8,7 @@ amqp==2.6.1 # via kombu analytics-python==1.4.post1 # via -r requirements/base.in -asgiref==3.7.2 +asgiref==3.8.1 # via # django # django-cors-headers @@ -18,7 +18,9 @@ async-timeout==4.0.3 backoff==1.10.0 # via analytics-python backports-zoneinfo==0.2.1 - # via django + # via + # django + # djangorestframework billiard==3.6.4.0 # via celery celery==4.4.7 @@ -96,7 +98,7 @@ django-waffle==4.1.0 # -r requirements/base.in # edx-django-utils # edx-drf-extensions -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via # -r requirements/base.in # django-user-tasks @@ -173,7 +175,6 @@ pytz==2024.1 # via # -r requirements/base.in # celery - # djangorestframework # drf-yasg pyyaml==6.0.1 # via @@ -189,7 +190,7 @@ requests==2.31.0 # requests-oauthlib # slumber # social-auth-core -requests-oauthlib==1.4.0 +requests-oauthlib==2.0.0 # via social-auth-core semantic-version==2.10.0 # via edx-drf-extensions diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 1f68538a..2b6d23d1 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/devstack.txt b/requirements/devstack.txt index 3bcdc968..f0310a7f 100644 --- a/requirements/devstack.txt +++ b/requirements/devstack.txt @@ -18,7 +18,7 @@ amqp==2.6.1 # kombu analytics-python==1.4.post1 # via -r requirements/local.txt -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/local.txt # django @@ -46,6 +46,7 @@ backports-zoneinfo==0.2.1 # via # -r requirements/local.txt # django + # djangorestframework beautifulsoup4==4.12.3 # via # -r requirements/local.txt @@ -54,12 +55,12 @@ billiard==3.6.4.0 # via # -r requirements/local.txt # celery -boto3==1.34.60 +boto3==1.34.70 # via # -c requirements/constraints.txt # -r requirements/local.txt # moto -botocore==1.34.60 +botocore==1.34.70 # via # -r requirements/local.txt # boto3 @@ -102,7 +103,7 @@ click-log==0.4.0 # via # -r requirements/local.txt # edx-lint -code-annotations==1.6.0 +code-annotations==1.7.0 # via # -c requirements/constraints.txt # -r requirements/local.txt @@ -115,7 +116,7 @@ configobj==5.0.8 # via # -r requirements/local.txt # ruamel-yaml-cmd -coverage[toml]==7.4.3 +coverage[toml]==7.4.4 # via # -r requirements/local.txt # pytest-cov @@ -200,7 +201,7 @@ django-waffle==4.1.0 # -r requirements/local.txt # edx-django-utils # edx-drf-extensions -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via # -r requirements/local.txt # django-user-tasks @@ -251,11 +252,11 @@ exceptiongroup==1.2.0 # pytest factory-boy==3.3.0 # via -r requirements/local.txt -faker==24.1.0 +faker==24.4.0 # via # -r requirements/local.txt # factory-boy -filelock==3.13.1 +filelock==3.13.3 # via # -r requirements/local.txt # tox @@ -270,8 +271,9 @@ imagesize==1.4.1 # via # -r requirements/local.txt # sphinx -importlib-metadata==7.0.2 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # -r requirements/local.txt # sphinx inflection==0.5.1 @@ -439,7 +441,7 @@ pytest==8.1.1 # -r requirements/local.txt # pytest-cov # pytest-django -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/local.txt pytest-django==4.8.0 # via -r requirements/local.txt @@ -468,7 +470,6 @@ pytz==2024.1 # -r requirements/local.txt # babel # celery - # djangorestframework # drf-yasg pywatchman==2.0.0 # via -r requirements/local.txt @@ -494,7 +495,7 @@ requests==2.31.0 # slumber # social-auth-core # sphinx -requests-oauthlib==1.4.0 +requests-oauthlib==2.0.0 # via # -r requirements/local.txt # social-auth-core @@ -523,7 +524,7 @@ ruamel-yaml-convert==0.3.2 # via # -r requirements/local.txt # ruamel-yaml-cmd -s3transfer==0.10.0 +s3transfer==0.10.1 # via # -r requirements/local.txt # boto3 @@ -620,7 +621,7 @@ tomlkit==0.12.4 # via # -r requirements/local.txt # pylint -tox==4.14.1 +tox==4.14.2 # via -r requirements/local.txt typing-extensions==4.10.0 # via @@ -661,7 +662,7 @@ xmltodict==0.13.0 # moto yamllint==1.35.1 # via -r requirements/local.txt -zipp==3.17.0 +zipp==3.18.1 # via # -r requirements/local.txt # importlib-metadata diff --git a/requirements/docs.txt b/requirements/docs.txt index c6af2380..54a7abc2 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 markupsafe==2.1.5 @@ -76,5 +78,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/local.txt b/requirements/local.txt index c454c77f..59fc3414 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -18,7 +18,7 @@ amqp==2.6.1 # kombu analytics-python==1.4.post1 # via -r requirements/test.txt -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/test.txt # django @@ -46,6 +46,7 @@ backports-zoneinfo==0.2.1 # via # -r requirements/test.txt # django + # djangorestframework beautifulsoup4==4.12.3 # via # -r requirements/docs.txt @@ -54,12 +55,12 @@ billiard==3.6.4.0 # via # -r requirements/test.txt # celery -boto3==1.34.60 +boto3==1.34.70 # via # -c requirements/constraints.txt # -r requirements/test.txt # moto -botocore==1.34.60 +botocore==1.34.70 # via # -r requirements/test.txt # boto3 @@ -104,7 +105,7 @@ click-log==0.4.0 # via # -r requirements/test.txt # edx-lint -code-annotations==1.6.0 +code-annotations==1.7.0 # via # -c requirements/constraints.txt # -r requirements/test.txt @@ -115,7 +116,7 @@ colorama==0.4.6 # tox configobj==5.0.8 # via ruamel-yaml-cmd -coverage[toml]==7.4.3 +coverage[toml]==7.4.4 # via # -r requirements/test.txt # pytest-cov @@ -200,7 +201,7 @@ django-waffle==4.1.0 # -r requirements/test.txt # edx-django-utils # edx-drf-extensions -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via # -r requirements/test.txt # django-user-tasks @@ -251,11 +252,11 @@ exceptiongroup==1.2.0 # pytest factory-boy==3.3.0 # via -r requirements/test.txt -faker==24.1.0 +faker==24.4.0 # via # -r requirements/test.txt # factory-boy -filelock==3.13.1 +filelock==3.13.3 # via # -r requirements/test.txt # tox @@ -271,8 +272,9 @@ imagesize==1.4.1 # via # -r requirements/docs.txt # sphinx -importlib-metadata==7.0.2 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # -r requirements/docs.txt # sphinx inflection==0.5.1 @@ -431,7 +433,7 @@ pytest==8.1.1 # -r requirements/test.txt # pytest-cov # pytest-django -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/test.txt pytest-django==4.8.0 # via -r requirements/test.txt @@ -459,7 +461,6 @@ pytz==2024.1 # -r requirements/test.txt # babel # celery - # djangorestframework # drf-yasg pywatchman==2.0.0 # via -r requirements/local.in @@ -486,7 +487,7 @@ requests==2.31.0 # slumber # social-auth-core # sphinx -requests-oauthlib==1.4.0 +requests-oauthlib==2.0.0 # via # -r requirements/test.txt # social-auth-core @@ -508,7 +509,7 @@ ruamel-yaml-cmd==0.6.5 # via -r requirements/local.in ruamel-yaml-convert==0.3.2 # via ruamel-yaml-cmd -s3transfer==0.10.0 +s3transfer==0.10.1 # via # -r requirements/test.txt # boto3 @@ -605,7 +606,7 @@ tomlkit==0.12.4 # via # -r requirements/test.txt # pylint -tox==4.14.1 +tox==4.14.2 # via -r requirements/test.txt typing-extensions==4.10.0 # via @@ -648,7 +649,7 @@ xmltodict==0.13.0 # moto yamllint==1.35.1 # via -r requirements/test.txt -zipp==3.17.0 +zipp==3.18.1 # via # -r requirements/docs.txt # importlib-metadata diff --git a/requirements/monitoring/requirements.txt b/requirements/monitoring/requirements.txt index b9b09230..ed1d5621 100644 --- a/requirements/monitoring/requirements.txt +++ b/requirements/monitoring/requirements.txt @@ -27,7 +27,7 @@ analytics-python==1.4.post1 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -70,6 +70,7 @@ backports-zoneinfo==0.2.1 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # django + # djangorestframework beautifulsoup4==4.12.3 # via # -r requirements/monitoring/../devstack.txt @@ -82,14 +83,14 @@ billiard==3.6.4.0 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # celery -boto3==1.34.60 +boto3==1.34.70 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # moto -botocore==1.34.60 +botocore==1.34.70 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -155,7 +156,7 @@ click-log==0.4.0 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt # edx-lint -code-annotations==1.6.0 +code-annotations==1.7.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -172,7 +173,7 @@ configobj==5.0.8 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # ruamel-yaml-cmd -coverage[toml]==7.4.3 +coverage[toml]==7.4.4 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -311,7 +312,7 @@ django-waffle==4.1.0 # -r requirements/monitoring/../test.txt # edx-django-utils # edx-drf-extensions -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -408,13 +409,13 @@ factory-boy==3.3.0 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt -faker==24.1.0 +faker==24.4.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt # factory-boy -filelock==3.13.1 +filelock==3.13.3 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -446,7 +447,7 @@ imagesize==1.4.1 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # sphinx -importlib-metadata==7.0.2 +importlib-metadata==6.11.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -700,7 +701,7 @@ pytest==8.1.1 # -r requirements/monitoring/../test.txt # pytest-cov # pytest-django -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -748,7 +749,6 @@ pytz==2024.1 # -r requirements/monitoring/../test.txt # babel # celery - # djangorestframework # drf-yasg pywatchman==2.0.0 # via @@ -786,7 +786,7 @@ requests==2.31.0 # slumber # social-auth-core # sphinx -requests-oauthlib==1.4.0 +requests-oauthlib==2.0.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -825,7 +825,7 @@ ruamel-yaml-convert==0.3.2 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # ruamel-yaml-cmd -s3transfer==0.10.0 +s3transfer==0.10.1 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -964,7 +964,7 @@ tomlkit==0.12.4 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt # pylint -tox==4.14.1 +tox==4.14.2 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -1028,7 +1028,7 @@ yamllint==1.35.1 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt -zipp==3.17.0 +zipp==3.18.1 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index b876b7b0..8931dc2e 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -8,7 +8,7 @@ build==1.1.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==7.0.2 +importlib-metadata==7.1.0 # via build packaging==24.0 # via build @@ -25,7 +25,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/pip.txt b/requirements/pip.txt index 0094cc68..cf449024 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/production.txt b/requirements/production.txt index a59a183d..2783c1ce 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,7 +10,7 @@ amqp==2.6.1 # kombu analytics-python==1.4.post1 # via -r requirements/base.txt -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/base.txt # django @@ -28,15 +28,16 @@ backports-zoneinfo==0.2.1 # via # -r requirements/base.txt # django + # djangorestframework billiard==3.6.4.0 # via # -r requirements/base.txt # celery -boto3==1.34.60 +boto3==1.34.70 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.34.60 +botocore==1.34.70 # via # boto3 # s3transfer @@ -126,7 +127,7 @@ django-waffle==4.1.0 # -r requirements/base.txt # edx-django-utils # edx-drf-extensions -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via # -r requirements/base.txt # django-user-tasks @@ -256,7 +257,6 @@ pytz==2024.1 # via # -r requirements/base.txt # celery - # djangorestframework # drf-yasg pyyaml==6.0.1 # via @@ -275,11 +275,11 @@ requests==2.31.0 # requests-oauthlib # slumber # social-auth-core -requests-oauthlib==1.4.0 +requests-oauthlib==2.0.0 # via # -r requirements/base.txt # social-auth-core -s3transfer==0.10.0 +s3transfer==0.10.1 # via boto3 semantic-version==2.10.0 # via diff --git a/requirements/test.txt b/requirements/test.txt index f958fb1f..34fa60a7 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -10,7 +10,7 @@ amqp==2.6.1 # kombu analytics-python==1.4.post1 # via -r requirements/base.txt -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/base.txt # django @@ -32,15 +32,16 @@ backports-zoneinfo==0.2.1 # via # -r requirements/base.txt # django + # djangorestframework billiard==3.6.4.0 # via # -r requirements/base.txt # celery -boto3==1.34.60 +boto3==1.34.70 # via # -c requirements/constraints.txt # moto -botocore==1.34.60 +botocore==1.34.70 # via # boto3 # moto @@ -76,14 +77,14 @@ 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 # -c requirements/constraints.txt # -r requirements/test.in # edx-lint colorama==0.4.6 # via tox -coverage[toml]==7.4.3 +coverage[toml]==7.4.4 # via # -r requirements/test.in # pytest-cov @@ -159,7 +160,7 @@ django-waffle==4.1.0 # -r requirements/base.txt # edx-django-utils # edx-drf-extensions -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via # -r requirements/base.txt # django-user-tasks @@ -201,11 +202,11 @@ exceptiongroup==1.2.0 # via pytest factory-boy==3.3.0 # via -r requirements/test.in -faker==24.1.0 +faker==24.4.0 # via # -r requirements/test.in # factory-boy -filelock==3.13.1 +filelock==3.13.3 # via # tox # virtualenv @@ -328,7 +329,7 @@ pytest==8.1.1 # -r requirements/test.in # pytest-cov # pytest-django -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/test.in pytest-django==4.8.0 # via -r requirements/test.in @@ -353,7 +354,6 @@ pytz==2024.1 # via # -r requirements/base.txt # celery - # djangorestframework # drf-yasg pyyaml==6.0.1 # via @@ -375,7 +375,7 @@ requests==2.31.0 # responses # slumber # social-auth-core -requests-oauthlib==1.4.0 +requests-oauthlib==2.0.0 # via # -r requirements/base.txt # social-auth-core @@ -384,7 +384,7 @@ responses==0.17.0 # -c requirements/constraints.txt # -r requirements/test.in # moto -s3transfer==0.10.0 +s3transfer==0.10.1 # via boto3 semantic-version==2.10.0 # via @@ -435,7 +435,7 @@ tomli==2.0.1 # tox tomlkit==0.12.4 # via pylint -tox==4.14.1 +tox==4.14.2 # via -r requirements/test.in typing-extensions==4.10.0 # via