From 32970fb2f5ef14afd02701e33738fdefe5806cea Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 25 Apr 2024 00:22:58 -0400 Subject: [PATCH] chore: Run `make upgrade` --- requirements/common_constraints.txt | 13 +++++++--- requirements/development.txt | 37 ++++++++++++----------------- requirements/pip.txt | 10 ++++---- requirements/pip_tools.txt | 18 ++++++++------ requirements/sandbox.txt | 13 +++++----- requirements/testing.txt | 37 ++++++++++++----------------- requirements/tox.txt | 27 +++++++++++---------- 7 files changed, 77 insertions(+), 78 deletions(-) diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index cca3ccd30..e3bf8eaec 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -13,13 +13,20 @@ # using LTS django version -Django<4.0 +Django<5.0 # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process. # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html elasticsearch<7.14.0 -setuptools<60 - # 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 b55e7ca98..e0ab4916f 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -1,28 +1,21 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -astroid==2.11.6 # via -r requirements/testing.txt, pylint -attrs==21.4.0 # via -r requirements/testing.txt, pytest -dill==0.3.5.1 # via -r requirements/testing.txt, pylint -iniconfig==1.1.1 # via -r requirements/testing.txt, pytest -isort==5.10.1 # via -r requirements/testing.txt, pylint -lazy-object-proxy==1.7.1 # via -r requirements/testing.txt, astroid +astroid==3.1.0 # via -r requirements/testing.txt, pylint +dill==0.3.8 # via -r requirements/testing.txt, pylint +exceptiongroup==1.2.1 # via -r requirements/testing.txt, pytest +iniconfig==2.0.0 # via -r requirements/testing.txt, pytest +isort==5.13.2 # via -r requirements/testing.txt, pylint mccabe==0.7.0 # via -r requirements/testing.txt, pylint -packaging==21.3 # via -r requirements/testing.txt, pytest -platformdirs==2.5.2 # via -r requirements/testing.txt, pylint -pluggy==1.0.0 # via -r requirements/testing.txt, pytest -py==1.11.0 # via -r requirements/testing.txt, pytest -pycodestyle==2.8.0 # via -r requirements/testing.txt -pylint==2.14.3 # via -r requirements/testing.txt -pyparsing==3.0.9 # via -r requirements/testing.txt, packaging -pytest==7.1.2 # via -r requirements/testing.txt +packaging==24.0 # via -r requirements/testing.txt, pytest +platformdirs==4.2.1 # via -r requirements/testing.txt, pylint +pluggy==1.5.0 # via -r requirements/testing.txt, pytest +pycodestyle==2.11.1 # via -r requirements/testing.txt +pylint==3.1.0 # via -r requirements/testing.txt +pytest==8.1.1 # via -r requirements/testing.txt tomli==2.0.1 # via -r requirements/testing.txt, pylint, pytest -tomlkit==0.11.0 # via -r requirements/testing.txt, pylint -typing-extensions==4.2.0 # via -r requirements/testing.txt, astroid, pylint -wrapt==1.14.1 # via -r requirements/testing.txt, astroid - -# The following packages are considered to be unsafe in a requirements file: -# setuptools +tomlkit==0.12.4 # via -r requirements/testing.txt, pylint +typing-extensions==4.11.0 # via -r requirements/testing.txt, astroid, pylint diff --git a/requirements/pip.txt b/requirements/pip.txt index 288ee524f..8eb91a436 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,11 +1,11 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -wheel==0.37.1 # via -r requirements/pip.in +wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==22.1.2 # via -r requirements/pip.in -setuptools==59.8.0 # via -c requirements/common_constraints.txt, -r requirements/pip.in +pip==24.0 # via -r requirements/pip.in +setuptools==69.5.1 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 8c7f6dad0..eeeabeeb7 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -1,14 +1,18 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -click==8.1.3 # via pip-tools -pep517==0.12.0 # via pip-tools -pip-tools==7.3.0 # via -r requirements/pip_tools.in -tomli==2.0.1 # via pep517 -wheel==0.37.1 # via pip-tools +build==1.2.1 # via pip-tools +click==8.1.7 # via pip-tools +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 +pyproject-hooks==1.0.0 # via build, pip-tools +tomli==2.0.1 # via build, pip-tools, pyproject-hooks +wheel==0.43.0 # via pip-tools +zipp==3.18.1 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/sandbox.txt b/requirements/sandbox.txt index fd7d60a87..4aeb57e13 100644 --- a/requirements/sandbox.txt +++ b/requirements/sandbox.txt @@ -1,12 +1,13 @@ # # This file is autogenerated by pip-compile with Python 3.8 -# To update, run: +# by the following command: # # make upgrade # -asgiref==3.5.2 # via django -django==3.2.17 # via -c requirements/common_constraints.txt, -c requirements/constraints.txt, -r requirements/sandbox.in -numpy==1.22.4 # via -r requirements/sandbox.in -pytz==2022.1 # via django +asgiref==3.8.1 # via django +django==3.2.25 # via -c requirements/common_constraints.txt, -c requirements/constraints.txt, -r requirements/sandbox.in +numpy==1.24.4 # via -r requirements/sandbox.in +pytz==2024.1 # via django six==1.16.0 # via -r requirements/sandbox.in -sqlparse==0.4.2 # via django +sqlparse==0.5.0 # via django +typing-extensions==4.11.0 # via asgiref diff --git a/requirements/testing.txt b/requirements/testing.txt index 95ea106d2..cb21847e0 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -1,28 +1,21 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -astroid==2.11.6 # via pylint -attrs==21.4.0 # via pytest -dill==0.3.5.1 # via pylint -iniconfig==1.1.1 # via pytest -isort==5.10.1 # via -r requirements/testing.in, pylint -lazy-object-proxy==1.7.1 # via astroid +astroid==3.1.0 # via pylint +dill==0.3.8 # via pylint +exceptiongroup==1.2.1 # via pytest +iniconfig==2.0.0 # via pytest +isort==5.13.2 # via -r requirements/testing.in, pylint mccabe==0.7.0 # via pylint -packaging==21.3 # via pytest -platformdirs==2.5.2 # via pylint -pluggy==1.0.0 # via pytest -py==1.11.0 # via pytest -pycodestyle==2.8.0 # via -r requirements/testing.in -pylint==2.14.3 # via -r requirements/testing.in -pyparsing==3.0.9 # via packaging -pytest==7.1.2 # via -r requirements/testing.in +packaging==24.0 # via pytest +platformdirs==4.2.1 # via pylint +pluggy==1.5.0 # via pytest +pycodestyle==2.11.1 # via -r requirements/testing.in +pylint==3.1.0 # via -r requirements/testing.in +pytest==8.1.1 # via -r requirements/testing.in tomli==2.0.1 # via pylint, pytest -tomlkit==0.11.0 # via pylint -typing-extensions==4.2.0 # via astroid, pylint -wrapt==1.14.1 # via astroid - -# The following packages are considered to be unsafe in a requirements file: -# setuptools +tomlkit==0.12.4 # via pylint +typing-extensions==4.11.0 # via astroid, pylint diff --git a/requirements/tox.txt b/requirements/tox.txt index ae38e0e36..ac00fa54a 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -1,17 +1,18 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -distlib==0.3.4 # via virtualenv -filelock==3.7.1 # via tox, virtualenv -packaging==21.3 # via tox -platformdirs==2.5.2 # via virtualenv -pluggy==1.0.0 # via tox -py==1.11.0 # via tox -pyparsing==3.0.9 # via packaging -six==1.16.0 # via tox, virtualenv -toml==0.10.2 # via tox -tox==3.25.0 # via -r requirements/tox.in -virtualenv==20.14.1 # via tox +cachetools==5.3.3 # via tox +chardet==5.2.0 # via tox +colorama==0.4.6 # via tox +distlib==0.3.8 # via virtualenv +filelock==3.13.4 # via tox, virtualenv +packaging==24.0 # via pyproject-api, tox +platformdirs==4.2.1 # via tox, virtualenv +pluggy==1.5.0 # via tox +pyproject-api==1.6.1 # via tox +tomli==2.0.1 # via pyproject-api, tox +tox==4.14.2 # via -r requirements/tox.in +virtualenv==20.26.0 # via tox