From f65563c44b9fe38ebefb474866b3aa7a7e402f7a Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Wed, 15 Nov 2023 23:01:00 -0500 Subject: [PATCH 1/3] chore: Updating Python Requirements --- edx_repo_tools/audit_gh_users/extra.txt | 2 +- edx_repo_tools/conventional_commits/extra.txt | 18 ++-- edx_repo_tools/find_dependencies/extra.txt | 6 +- edx_repo_tools/repo_access_scraper/extra.txt | 6 +- edx_repo_tools/repo_checks/extra.txt | 6 +- requirements/base.txt | 61 +++++++------ requirements/common_constraints.txt | 7 +- requirements/development.txt | 86 ++++++++++--------- requirements/pip-tools.txt | 4 +- requirements/pip.txt | 4 +- 10 files changed, 109 insertions(+), 91 deletions(-) diff --git a/edx_repo_tools/audit_gh_users/extra.txt b/edx_repo_tools/audit_gh_users/extra.txt index c764ef71..21f300c7 100644 --- a/edx_repo_tools/audit_gh_users/extra.txt +++ b/edx_repo_tools/audit_gh_users/extra.txt @@ -10,7 +10,7 @@ fastcore==1.5.29 # via ghapi ghapi==1.0.4 # via -r edx_repo_tools/audit_gh_users/extra.in -packaging==23.1 +packaging==23.2 # via # fastcore # ghapi diff --git a/edx_repo_tools/conventional_commits/extra.txt b/edx_repo_tools/conventional_commits/extra.txt index e558d852..b08fc27d 100644 --- a/edx_repo_tools/conventional_commits/extra.txt +++ b/edx_repo_tools/conventional_commits/extra.txt @@ -4,29 +4,29 @@ # # make upgrade # -alembic==1.12.0 +alembic==1.12.1 # via dataset banal==1.0.6 # via dataset contourpy==1.1.1 # via matplotlib -cycler==0.11.0 +cycler==0.12.1 # via matplotlib dataset==1.6.2 # via -r edx_repo_tools/conventional_commits/extra.in -fonttools==4.42.1 +fonttools==4.44.3 # via matplotlib -greenlet==2.0.2 +greenlet==3.0.1 # via sqlalchemy importlib-metadata==6.8.0 # via alembic -importlib-resources==6.1.0 +importlib-resources==6.1.1 # via # alembic # matplotlib kiwisolver==1.4.5 # via matplotlib -mako==1.2.4 +mako==1.3.0 # via alembic markupsafe==2.1.3 # via mako @@ -37,11 +37,11 @@ numpy==1.24.4 # contourpy # matplotlib # pandas -packaging==23.1 +packaging==23.2 # via matplotlib pandas==2.0.3 # via -r edx_repo_tools/conventional_commits/extra.in -pillow==10.0.1 +pillow==10.1.0 # via matplotlib pyparsing==3.1.1 # via matplotlib @@ -53,7 +53,7 @@ pytz==2023.3.post1 # via pandas six==1.16.0 # via python-dateutil -sqlalchemy==1.4.49 +sqlalchemy==1.4.50 # via # alembic # dataset diff --git a/edx_repo_tools/find_dependencies/extra.txt b/edx_repo_tools/find_dependencies/extra.txt index ff2d653d..6f3a86a9 100644 --- a/edx_repo_tools/find_dependencies/extra.txt +++ b/edx_repo_tools/find_dependencies/extra.txt @@ -6,7 +6,7 @@ # certifi==2023.7.22 # via requests -charset-normalizer==3.2.0 +charset-normalizer==3.3.2 # via requests idna==3.4 # via requests @@ -18,9 +18,9 @@ pygments==2.16.1 # via rich requests==2.31.0 # via -r edx_repo_tools/find_dependencies/extra.in -rich==13.5.3 +rich==13.7.0 # via -r edx_repo_tools/find_dependencies/extra.in typing-extensions==4.8.0 # via rich -urllib3==2.0.5 +urllib3==2.1.0 # via requests diff --git a/edx_repo_tools/repo_access_scraper/extra.txt b/edx_repo_tools/repo_access_scraper/extra.txt index 5ce2cbee..4cb6a94f 100644 --- a/edx_repo_tools/repo_access_scraper/extra.txt +++ b/edx_repo_tools/repo_access_scraper/extra.txt @@ -4,11 +4,11 @@ # # make upgrade # -greenlet==2.0.2 +greenlet==3.0.0 # via playwright -playwright==1.38.0 +playwright==1.39.0 # via -r edx_repo_tools/repo_access_scraper/extra.in -pyee==9.0.4 +pyee==11.0.1 # via playwright typing-extensions==4.8.0 # via diff --git a/edx_repo_tools/repo_checks/extra.txt b/edx_repo_tools/repo_checks/extra.txt index be870148..1d55cd84 100644 --- a/edx_repo_tools/repo_checks/extra.txt +++ b/edx_repo_tools/repo_checks/extra.txt @@ -8,7 +8,7 @@ cache-to-disk==2.0.0 # via -r edx_repo_tools/repo_checks/extra.in certifi==2023.7.22 # via requests -charset-normalizer==3.2.0 +charset-normalizer==3.3.2 # via requests click==8.1.7 # via -r edx_repo_tools/repo_checks/extra.in @@ -18,7 +18,7 @@ ghapi==1.0.4 # via -r edx_repo_tools/repo_checks/extra.in idna==3.4 # via requests -packaging==23.1 +packaging==23.2 # via # fastcore # ghapi @@ -26,7 +26,7 @@ pyyaml==6.0.1 # via -r edx_repo_tools/repo_checks/extra.in requests==2.31.0 # via -r edx_repo_tools/repo_checks/extra.in -urllib3==2.0.5 +urllib3==2.1.0 # via requests # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/base.txt b/requirements/base.txt index 126ddc38..d4c6d403 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -16,18 +16,24 @@ bowler==0.9.0 # via -r requirements/base.in cachecontrol==0.13.1 # via -r requirements/base.in +cachetools==5.3.2 + # via tox certifi==2023.7.22 # via requests -cffi==1.15.1 +cffi==1.16.0 # via cryptography -charset-normalizer==3.2.0 +chardet==5.2.0 + # via tox +charset-normalizer==3.3.2 # via requests click==8.1.7 # via # -r requirements/base.in # bowler # moreorless -cryptography==41.0.4 +colorama==0.4.6 + # via tox +cryptography==41.0.5 # via pyjwt distlib==0.3.7 # via virtualenv @@ -37,17 +43,17 @@ exceptiongroup==1.1.3 # via pytest execnet==2.0.2 # via pytest-xdist -filelock==3.12.4 +filelock==3.13.1 # via # tox # virtualenv fissix==21.11.13 # via bowler -gitdb==4.0.10 +gitdb==4.0.11 # via gitpython github3-py==4.0.1 # via -r requirements/base.in -gitpython==3.1.37 +gitpython==3.1.40 # via -r requirements/base.in idna==3.4 # via requests @@ -61,36 +67,42 @@ more-itertools==10.1.0 # via -r requirements/base.in moreorless==0.4.0 # via bowler -msgpack==1.0.6 +msgpack==1.0.7 # via cachecontrol -packaging==23.1 +packaging==23.2 # via + # pyproject-api # pytest # tox path==16.7.1 # via path-py path-py==12.5.0 # via -r requirements/base.in -platformdirs==3.10.0 - # via virtualenv +platformdirs==3.11.0 + # via + # -c requirements/common_constraints.txt + # tox + # virtualenv pluggy==1.3.0 # via # pytest # tox -py==1.11.0 - # via tox pycparser==2.21 # via cffi pyjwt[crypto]==2.8.0 - # via github3-py -pytest==7.4.2 + # via + # github3-py + # pyjwt +pyproject-api==1.6.1 + # via tox +pytest==7.4.3 # via # -r requirements/base.in # pytest-logging # pytest-xdist pytest-logging==2015.11.4 # via -r requirements/base.in -pytest-xdist==3.3.1 +pytest-xdist==3.4.0 # via -r requirements/base.in python-dateutil==2.8.2 # via @@ -105,37 +117,34 @@ requests==2.31.0 # -r requirements/base.in # cachecontrol # github3-py -ruamel-yaml==0.17.32 +ruamel-yaml==0.18.5 # via -r requirements/base.in -ruamel-yaml-clib==0.2.7 +ruamel-yaml-clib==0.2.8 # via ruamel-yaml six==1.16.0 - # via - # python-dateutil - # tox + # via python-dateutil smmap==5.0.1 # via gitdb statistics==1.0.3.5 # via -r requirements/base.in tomli==2.0.1 # via + # pyproject-api # pytest # tox -tox==3.28.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/base.in +tox==4.11.3 + # via -r requirements/base.in tqdm==4.66.1 # via -r requirements/base.in uritemplate==4.1.1 # via # -r requirements/base.in # github3-py -urllib3==2.0.5 +urllib3==2.1.0 # via requests urlobject==2.4.3 # via -r requirements/base.in -virtualenv==20.24.5 +virtualenv==20.24.6 # via tox volatile==2.1.0 # via bowler diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index afe6aa88..d6c92800 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -22,6 +22,7 @@ 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 -# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos. -# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810 -tox<4.0.0 +# virtualenv latest version requires platformdirs<4.0 which conflicts with tox>4.0 version +# This constraint can be removed once the issue +# https://github.com/pypa/virtualenv/issues/2666 gets resolved +platformdirs<4.0 diff --git a/requirements/development.txt b/requirements/development.txt index 40cb7cc7..f486d786 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -8,7 +8,7 @@ appdirs==1.4.4 # via # -r requirements/base.txt # fissix -astroid==2.15.8 +astroid==3.0.1 # via # pylint # pylint-celery @@ -24,15 +24,23 @@ build==1.0.3 # via pip-tools cachecontrol==0.13.1 # via -r requirements/base.txt +cachetools==5.3.2 + # via + # -r requirements/base.txt + # tox certifi==2023.7.22 # via # -r requirements/base.txt # requests -cffi==1.15.1 +cffi==1.16.0 # via # -r requirements/base.txt # cryptography -charset-normalizer==3.2.0 +chardet==5.2.0 + # via + # -r requirements/base.txt + # tox +charset-normalizer==3.3.2 # via # -r requirements/base.txt # requests @@ -49,7 +57,11 @@ click-log==0.4.0 # via edx-lint code-annotations==1.5.0 # via edx-lint -cryptography==41.0.4 +colorama==0.4.6 + # via + # -r requirements/base.txt + # tox +cryptography==41.0.5 # via # -r requirements/base.txt # pyjwt @@ -63,7 +75,7 @@ docutils==0.20.1 # via # -r requirements/base.txt # statistics -edx-lint==5.3.4 +edx-lint==5.3.6 # via -r requirements/development.in exceptiongroup==1.1.3 # via @@ -73,7 +85,7 @@ execnet==2.0.2 # via # -r requirements/base.txt # pytest-xdist -filelock==3.12.4 +filelock==3.13.1 # via # -r requirements/base.txt # tox @@ -82,13 +94,13 @@ fissix==21.11.13 # via # -r requirements/base.txt # bowler -gitdb==4.0.10 +gitdb==4.0.11 # via # -r requirements/base.txt # gitpython github3-py==4.0.1 # via -r requirements/base.txt -gitpython==3.1.37 +gitpython==3.1.40 # via -r requirements/base.txt idna==3.4 # via @@ -106,8 +118,6 @@ jinja2==3.1.2 # via code-annotations lazy==1.6 # via -r requirements/base.txt -lazy-object-proxy==1.9.0 - # via astroid lockfile==0.12.2 # via -r requirements/base.txt markupsafe==2.1.3 @@ -120,14 +130,15 @@ moreorless==0.4.0 # via # -r requirements/base.txt # bowler -msgpack==1.0.6 +msgpack==1.0.7 # via # -r requirements/base.txt # cachecontrol -packaging==23.1 +packaging==23.2 # via # -r requirements/base.txt # build + # pyproject-api # pytest # tox path==16.7.1 @@ -136,24 +147,22 @@ path==16.7.1 # path-py path-py==12.5.0 # via -r requirements/base.txt -pbr==5.11.1 +pbr==6.0.0 # via stevedore pip-tools==7.3.0 # via -r requirements/development.in -platformdirs==3.10.0 +platformdirs==3.11.0 # via + # -c requirements/common_constraints.txt # -r requirements/base.txt # pylint + # tox # virtualenv pluggy==1.3.0 # via # -r requirements/base.txt # pytest # tox -py==1.11.0 - # via - # -r requirements/base.txt - # tox pycparser==2.21 # via # -r requirements/base.txt @@ -162,7 +171,8 @@ pyjwt[crypto]==2.8.0 # via # -r requirements/base.txt # github3-py -pylint==2.17.6 + # pyjwt +pylint==3.0.2 # via # edx-lint # pylint-celery @@ -170,15 +180,19 @@ pylint==2.17.6 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.5.3 +pylint-django==2.5.5 # via edx-lint pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django +pyproject-api==1.6.1 + # via + # -r requirements/base.txt + # tox pyproject-hooks==1.0.0 # via build -pytest==7.4.2 +pytest==7.4.3 # via # -r requirements/base.txt # -r requirements/development.in @@ -187,9 +201,9 @@ pytest==7.4.2 # pytest-xdist pytest-logging==2015.11.4 # via -r requirements/base.txt -pytest-mock==3.11.1 +pytest-mock==3.12.0 # via -r requirements/development.in -pytest-xdist==3.3.1 +pytest-xdist==3.4.0 # via -r requirements/base.txt python-dateutil==2.8.2 # via @@ -210,11 +224,11 @@ requests==2.31.0 # cachecontrol # github3-py # responses -responses==0.23.3 +responses==0.24.1 # via -r requirements/development.in -ruamel-yaml==0.17.32 +ruamel-yaml==0.18.5 # via -r requirements/base.txt -ruamel-yaml-clib==0.2.7 +ruamel-yaml-clib==0.2.8 # via # -r requirements/base.txt # ruamel-yaml @@ -223,7 +237,6 @@ six==1.16.0 # -r requirements/base.txt # edx-lint # python-dateutil - # tox smmap==5.0.1 # via # -r requirements/base.txt @@ -240,19 +253,16 @@ tomli==2.0.1 # build # pip-tools # pylint + # pyproject-api # pyproject-hooks # pytest # tox -tomlkit==0.12.1 +tomlkit==0.12.3 # via pylint -tox==3.28.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/base.txt +tox==4.11.3 + # via -r requirements/base.txt tqdm==4.66.1 # via -r requirements/base.txt -types-pyyaml==6.0.12.12 - # via responses typing-extensions==4.8.0 # via # astroid @@ -261,14 +271,14 @@ uritemplate==4.1.1 # via # -r requirements/base.txt # github3-py -urllib3==2.0.5 +urllib3==2.1.0 # via # -r requirements/base.txt # requests # responses urlobject==2.4.3 # via -r requirements/base.txt -virtualenv==20.24.5 +virtualenv==20.24.6 # via # -r requirements/base.txt # tox @@ -276,10 +286,8 @@ volatile==2.1.0 # via # -r requirements/base.txt # bowler -wheel==0.41.2 +wheel==0.41.3 # via pip-tools -wrapt==1.15.0 - # via astroid zipp==3.17.0 # via importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 894fa179..ea347319 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -10,7 +10,7 @@ click==8.1.7 # via pip-tools importlib-metadata==6.8.0 # via build -packaging==23.1 +packaging==23.2 # via build pip-tools==7.3.0 # via -r requirements/pip-tools.in @@ -21,7 +21,7 @@ tomli==2.0.1 # build # pip-tools # pyproject-hooks -wheel==0.41.2 +wheel==0.41.3 # via pip-tools zipp==3.17.0 # via importlib-metadata diff --git a/requirements/pip.txt b/requirements/pip.txt index 3e7d8f4a..9014f2cf 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.41.2 +wheel==0.41.3 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.2.1 +pip==23.3.1 # via -r requirements/pip.in setuptools==68.2.2 # via -r requirements/pip.in From d700f307ec56ebfa22765f3b6637908b8cd17a11 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Thu, 16 Nov 2023 15:55:28 +0500 Subject: [PATCH 2/3] fix: greenlet requirement conflict --- edx_repo_tools/conventional_commits/extra.txt | 4 +++- edx_repo_tools/repo_access_scraper/extra.txt | 10 +++++++--- requirements/constraints.txt | 3 +++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/edx_repo_tools/conventional_commits/extra.txt b/edx_repo_tools/conventional_commits/extra.txt index b08fc27d..42e200e6 100644 --- a/edx_repo_tools/conventional_commits/extra.txt +++ b/edx_repo_tools/conventional_commits/extra.txt @@ -17,7 +17,9 @@ dataset==1.6.2 fonttools==4.44.3 # via matplotlib greenlet==3.0.1 - # via sqlalchemy + # via + # -c edx_repo_tools/conventional_commits/../../requirements/constraints.txt + # sqlalchemy importlib-metadata==6.8.0 # via alembic importlib-resources==6.1.1 diff --git a/edx_repo_tools/repo_access_scraper/extra.txt b/edx_repo_tools/repo_access_scraper/extra.txt index 4cb6a94f..e7d51891 100644 --- a/edx_repo_tools/repo_access_scraper/extra.txt +++ b/edx_repo_tools/repo_access_scraper/extra.txt @@ -4,9 +4,11 @@ # # make upgrade # -greenlet==3.0.0 - # via playwright -playwright==1.39.0 +greenlet==3.0.1 + # via + # -c edx_repo_tools/repo_access_scraper/../../requirements/constraints.txt + # playwright +playwright==1.18.1 # via -r edx_repo_tools/repo_access_scraper/extra.in pyee==11.0.1 # via playwright @@ -14,3 +16,5 @@ typing-extensions==4.8.0 # via # playwright # pyee +websockets==12.0 + # via playwright diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 88be8121..348d8fa9 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -1 +1,4 @@ -c common_constraints.txt + +# playwright and sqlalchemy requirements conflict for greenlet<=3.0.0 +greenlet>3.0.0 From e323fc36286cae34eac3b8c25c67df7aa03f7ad5 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Thu, 16 Nov 2023 16:11:20 +0500 Subject: [PATCH 3/3] refactor: replace ruamel.yaml.main with ruamel.yaml.YAML().load --- .../codemods/node16/gha_release_workflow_modernizer.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/edx_repo_tools/codemods/node16/gha_release_workflow_modernizer.py b/edx_repo_tools/codemods/node16/gha_release_workflow_modernizer.py index 8d134f38..283e1d59 100644 --- a/edx_repo_tools/codemods/node16/gha_release_workflow_modernizer.py +++ b/edx_repo_tools/codemods/node16/gha_release_workflow_modernizer.py @@ -7,7 +7,7 @@ from pathlib import Path import click -from ruamel.yaml.main import round_trip_load as yaml_load +from ruamel.yaml import YAML from edx_repo_tools.utils import YamlLoader @@ -26,7 +26,8 @@ def _does_nvmrc_exists(self): def _add_setup_nodejs_env_step(self, step_elements, step_index): if self._does_nvmrc_exists(): - fetch_node_version_step = yaml_load(FETCH_NODE_VERSION_STEP) + yaml = YAML() + fetch_node_version_step = yaml.load(FETCH_NODE_VERSION_STEP) step_elements.insert( step_index, fetch_node_version_step) return step_elements