diff --git a/edx_repo_tools/audit_gh_users/extra.txt b/edx_repo_tools/audit_gh_users/extra.txt index 21f300c7..febd67ed 100644 --- a/edx_repo_tools/audit_gh_users/extra.txt +++ b/edx_repo_tools/audit_gh_users/extra.txt @@ -8,9 +8,9 @@ click==8.1.7 # via -r edx_repo_tools/audit_gh_users/extra.in fastcore==1.5.29 # via ghapi -ghapi==1.0.4 +ghapi==1.0.5 # via -r edx_repo_tools/audit_gh_users/extra.in -packaging==23.2 +packaging==24.0 # via # fastcore # ghapi diff --git a/edx_repo_tools/conventional_commits/extra.txt b/edx_repo_tools/conventional_commits/extra.txt index 72df52fb..954f433e 100644 --- a/edx_repo_tools/conventional_commits/extra.txt +++ b/edx_repo_tools/conventional_commits/extra.txt @@ -14,15 +14,17 @@ cycler==0.12.1 # via matplotlib dataset==1.6.2 # via -r edx_repo_tools/conventional_commits/extra.in -fonttools==4.49.0 +fonttools==4.50.0 # via matplotlib greenlet==3.0.3 # via # -c edx_repo_tools/conventional_commits/../../requirements/constraints.txt # sqlalchemy -importlib-metadata==7.0.1 - # via alembic -importlib-resources==6.1.2 +importlib-metadata==6.11.0 + # via + # -c edx_repo_tools/conventional_commits/../../requirements/common_constraints.txt + # alembic +importlib-resources==6.4.0 # via # alembic # matplotlib @@ -39,11 +41,11 @@ numpy==1.24.4 # contourpy # matplotlib # pandas -packaging==23.2 +packaging==24.0 # via matplotlib pandas==2.0.3 # via -r edx_repo_tools/conventional_commits/extra.in -pillow==10.2.0 +pillow==10.3.0 # via matplotlib pyparsing==3.1.2 # via matplotlib @@ -63,7 +65,7 @@ typing-extensions==4.10.0 # via alembic tzdata==2024.1 # via pandas -zipp==3.17.0 +zipp==3.18.1 # via # importlib-metadata # importlib-resources diff --git a/edx_repo_tools/repo_checks/extra.txt b/edx_repo_tools/repo_checks/extra.txt index ba50ab66..ad47aa9c 100644 --- a/edx_repo_tools/repo_checks/extra.txt +++ b/edx_repo_tools/repo_checks/extra.txt @@ -14,11 +14,11 @@ click==8.1.7 # via -r edx_repo_tools/repo_checks/extra.in fastcore==1.5.29 # via ghapi -ghapi==1.0.4 +ghapi==1.0.5 # via -r edx_repo_tools/repo_checks/extra.in idna==3.6 # via requests -packaging==23.2 +packaging==24.0 # via # fastcore # ghapi diff --git a/requirements/base.txt b/requirements/base.txt index 2d9165b3..ccca1b17 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -43,7 +43,7 @@ exceptiongroup==1.2.0 # via pytest execnet==2.0.2 # via pytest-xdist -filelock==3.13.1 +filelock==3.13.3 # via # tox # virtualenv @@ -53,7 +53,7 @@ gitdb==4.0.11 # via gitpython github3-py==4.0.1 # via -r requirements/base.in -gitpython==3.1.42 +gitpython==3.1.43 # via -r requirements/base.in idna==3.6 # via requests @@ -69,7 +69,7 @@ moreorless==0.4.0 # via bowler msgpack==1.0.8 # via cachecontrol -packaging==23.2 +packaging==24.0 # via # pyproject-api # pytest @@ -86,13 +86,13 @@ pluggy==1.4.0 # via # pytest # tox -pycparser==2.21 +pycparser==2.22 # via cffi pyjwt[crypto]==2.8.0 # via github3-py pyproject-api==1.6.1 # via tox -pytest==8.0.2 +pytest==8.1.1 # via # -r requirements/base.in # pytest-logging @@ -129,7 +129,7 @@ tomli==2.0.1 # pyproject-api # pytest # tox -tox==4.14.1 +tox==4.14.2 # via -r requirements/base.in tqdm==4.66.2 # via -r requirements/base.in diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 96cc5dbd..e3bf8eae 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -21,3 +21,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/development.txt b/requirements/development.txt index 46fdcc12..94797714 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -20,7 +20,7 @@ backports-csv==1.0.7 # via -r requirements/base.txt bowler==0.9.0 # via -r requirements/base.txt -build==1.1.1 +build==1.2.1 # via pip-tools cachecontrol==0.14.0 # via -r requirements/base.txt @@ -55,7 +55,7 @@ click==8.1.7 # pip-tools 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 @@ -85,7 +85,7 @@ execnet==2.0.2 # via # -r requirements/base.txt # pytest-xdist -filelock==3.13.1 +filelock==3.13.3 # via # -r requirements/base.txt # tox @@ -100,14 +100,16 @@ gitdb==4.0.11 # gitpython github3-py==4.0.1 # via -r requirements/base.txt -gitpython==3.1.42 +gitpython==3.1.43 # via -r requirements/base.txt idna==3.6 # via # -r requirements/base.txt # requests -importlib-metadata==7.0.1 - # via build +importlib-metadata==6.11.0 + # via + # -c requirements/common_constraints.txt + # build iniconfig==2.0.0 # via # -r requirements/base.txt @@ -134,7 +136,7 @@ msgpack==1.0.8 # via # -r requirements/base.txt # cachecontrol -packaging==23.2 +packaging==24.0 # via # -r requirements/base.txt # build @@ -162,7 +164,7 @@ pluggy==1.4.0 # -r requirements/base.txt # pytest # tox -pycparser==2.21 +pycparser==2.22 # via # -r requirements/base.txt # cffi @@ -192,7 +194,7 @@ pyproject-hooks==1.0.0 # via # build # pip-tools -pytest==8.0.2 +pytest==8.1.1 # via # -r requirements/base.txt # -r requirements/development.in @@ -201,7 +203,7 @@ pytest==8.0.2 # pytest-xdist pytest-logging==2015.11.4 # via -r requirements/base.txt -pytest-mock==3.12.0 +pytest-mock==3.14.0 # via -r requirements/development.in pytest-xdist==3.5.0 # via -r requirements/base.txt @@ -259,7 +261,7 @@ tomli==2.0.1 # tox tomlkit==0.12.4 # via pylint -tox==4.14.1 +tox==4.14.2 # via -r requirements/base.txt tqdm==4.66.2 # via -r requirements/base.txt @@ -286,7 +288,11 @@ volatile==2.1.0 # via # -r requirements/base.txt # bowler -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: +# pip +# setuptools diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 921c5b5c..6401f544 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,13 +4,15 @@ # # make upgrade # -build==1.1.1 +build==1.2.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==7.0.1 - # via build -packaging==23.2 +importlib-metadata==6.11.0 + # via + # -c requirements/common_constraints.txt + # build +packaging==24.0 # via build pip-tools==7.4.1 # via -r requirements/pip-tools.in @@ -23,9 +25,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