From 186248334ababa16ef1a367de136f8de9607018f Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Tue, 19 Nov 2024 16:29:00 -0500 Subject: [PATCH 1/3] chore: Upgrade Python requirements --- requirements/base.txt | 12 +-- requirements/ci.txt | 16 ++-- requirements/common_constraints.txt | 18 +--- requirements/dev.txt | 96 +++++++------------- requirements/django.txt | 12 +-- requirements/doc.txt | 134 +++++++++++++--------------- requirements/pip-tools.txt | 21 ++--- requirements/pip.txt | 12 +-- requirements/quality.txt | 65 +++++--------- requirements/test.txt | 39 +++----- 10 files changed, 156 insertions(+), 269 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index c8d3d75..6ad1fe1 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,22 +1,22 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # click==8.1.7 # via -r requirements/base.in -jinja2==3.1.3 +jinja2==3.1.4 # via -r requirements/base.in -markupsafe==2.1.5 +markupsafe==3.0.2 # via jinja2 -pbr==6.0.0 +pbr==6.1.0 # via stevedore python-slugify==8.0.4 # via -r requirements/base.in -pyyaml==6.0.1 +pyyaml==6.0.2 # via -r requirements/base.in -stevedore==5.2.0 +stevedore==5.3.0 # via -r requirements/base.in text-unidecode==1.3 # via python-slugify diff --git a/requirements/ci.txt b/requirements/ci.txt index 5e50065..5a154f6 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,30 +1,28 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -distlib==0.3.8 +distlib==0.3.9 # via virtualenv -filelock==3.13.3 +filelock==3.16.1 # via # tox # virtualenv -packaging==24.0 +packaging==24.2 # via tox -platformdirs==4.2.0 +platformdirs==4.3.6 # via virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via tox py==1.11.0 # via tox six==1.16.0 # via tox -tomli==2.0.1 - # via tox tox==3.28.0 # via # -c requirements/constraints.txt # -r requirements/ci.in -virtualenv==20.25.1 +virtualenv==20.27.1 # via tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index c9d8d9c..a58adb9 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -1,8 +1,3 @@ -# This is a temporary solution to override the real common_constraints.txt -# In edx-lint, until the pyjwt constraint in edx-lint has been removed. -# See BOM-2721 for more details. -# Below is the copied and edited version of common_constraints - # A central location for most common version constraints # (across edx repos) for pip-installation. # @@ -16,22 +11,17 @@ # Note: Changes to this file will automatically be used by other repos, referencing # this file from Github directly. It does not require packaging in edx-lint. - # using LTS django version 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 +# See https://github.com/openedx/edx-platform/issues/35126 for more info 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 +# Cause: https://github.com/openedx/edx-lint/issues/458 +# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved. +pip<24.3 diff --git a/requirements/dev.txt b/requirements/dev.txt index 564e670..f9e0189 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -8,17 +8,12 @@ asgiref==3.8.1 # via # -r requirements/quality.txt # django -astroid==3.1.0 +astroid==3.3.5 # via # -r requirements/quality.txt # pylint # pylint-celery -backports-zoneinfo==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # -r requirements/quality.txt - # django -build==1.2.1 +build==1.2.2.post1 # via # -r requirements/pip-tools.txt # pip-tools @@ -36,44 +31,35 @@ click-log==0.4.0 # via # -r requirements/quality.txt # edx-lint -code-annotations==1.7.0 +code-annotations==1.8.2 # via # -r requirements/quality.txt # edx-lint -coverage[toml]==7.4.4 +coverage[toml]==7.6.7 # via # -r requirements/quality.txt # pytest-cov -diff-cover==8.0.3 +diff-cover==9.2.0 # via -r requirements/dev.in -dill==0.3.8 +dill==0.3.9 # via # -r requirements/quality.txt # pylint -distlib==0.3.8 +distlib==0.3.9 # via # -r requirements/ci.txt # virtualenv -django==4.2.11 +django==4.2.16 # via # -c requirements/common_constraints.txt # -r requirements/quality.txt -edx-lint==5.3.6 +edx-lint==5.4.1 # via -r requirements/quality.txt -exceptiongroup==1.2.0 - # via - # -r requirements/quality.txt - # pytest -filelock==3.13.3 +filelock==3.16.1 # via # -r requirements/ci.txt # tox # virtualenv -importlib-metadata==6.11.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/pip-tools.txt - # build iniconfig==2.0.0 # via # -r requirements/quality.txt @@ -82,12 +68,12 @@ isort==5.13.2 # via # -r requirements/quality.txt # pylint -jinja2==3.1.3 +jinja2==3.1.4 # via # -r requirements/quality.txt # code-annotations # diff-cover -markupsafe==2.1.5 +markupsafe==3.0.2 # via # -r requirements/quality.txt # jinja2 @@ -97,7 +83,7 @@ mccabe==0.7.0 # pylint mock==5.1.0 # via -r requirements/quality.txt -packaging==24.0 +packaging==24.2 # via # -r requirements/ci.txt # -r requirements/pip-tools.txt @@ -105,19 +91,19 @@ packaging==24.0 # build # pytest # tox -pbr==6.0.0 +pbr==6.1.0 # via # -r requirements/quality.txt # stevedore pip-tools==7.4.1 # via -r requirements/pip-tools.txt -platformdirs==4.2.0 +platformdirs==4.3.6 # via # -r requirements/ci.txt # -r requirements/quality.txt # pylint # virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -128,13 +114,13 @@ py==1.11.0 # via # -r requirements/ci.txt # tox -pycodestyle==2.11.1 +pycodestyle==2.12.1 # via -r requirements/quality.txt pydocstyle==6.3.0 # via -r requirements/quality.txt -pygments==2.17.2 +pygments==2.18.0 # via diff-cover -pylint==3.1.0 +pylint==3.3.1 # via # -r requirements/quality.txt # edx-lint @@ -145,7 +131,7 @@ pylint-celery==0.3 # via # -r requirements/quality.txt # edx-lint -pylint-django==2.5.5 +pylint-django==2.6.1 # via # -r requirements/quality.txt # edx-lint @@ -154,22 +140,22 @@ pylint-plugin-utils==0.8.2 # -r requirements/quality.txt # pylint-celery # pylint-django -pyproject-hooks==1.0.0 +pyproject-hooks==1.2.0 # via # -r requirements/pip-tools.txt # build # pip-tools -pytest==8.1.1 +pytest==8.3.3 # via # -r requirements/quality.txt # pytest-cov -pytest-cov==5.0.0 +pytest-cov==6.0.0 # via -r requirements/quality.txt python-slugify==8.0.4 # via # -r requirements/quality.txt # code-annotations -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -r requirements/quality.txt # code-annotations @@ -183,11 +169,11 @@ snowballstemmer==2.2.0 # via # -r requirements/quality.txt # pydocstyle -sqlparse==0.4.4 +sqlparse==0.5.2 # via # -r requirements/quality.txt # django -stevedore==5.2.0 +stevedore==5.3.0 # via # -r requirements/quality.txt # code-annotations @@ -195,19 +181,7 @@ text-unidecode==1.3 # via # -r requirements/quality.txt # python-slugify -tomli==2.0.1 - # via - # -r requirements/ci.txt - # -r requirements/pip-tools.txt - # -r requirements/quality.txt - # build - # coverage - # pip-tools - # pylint - # pyproject-hooks - # pytest - # tox -tomlkit==0.12.4 +tomlkit==0.13.2 # via # -r requirements/quality.txt # pylint @@ -215,24 +189,14 @@ tox==3.28.0 # via # -c requirements/constraints.txt # -r requirements/ci.txt -typing-extensions==4.10.0 - # via - # -r requirements/quality.txt - # asgiref - # astroid - # pylint -virtualenv==20.25.1 +virtualenv==20.27.1 # via # -r requirements/ci.txt # tox -wheel==0.43.0 +wheel==0.45.0 # via # -r requirements/pip-tools.txt # pip-tools -zipp==3.18.1 - # via - # -r requirements/pip-tools.txt - # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/django.txt b/requirements/django.txt index a700859..8052e68 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -1,20 +1,14 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # asgiref==3.8.1 # via django -backports-zoneinfo==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # django -django==4.2.11 +django==4.2.16 # via # -c requirements/common_constraints.txt # -r requirements/django.in -sqlparse==0.4.4 +sqlparse==0.5.2 # via django -typing-extensions==4.10.0 - # via asgiref diff --git a/requirements/doc.txt b/requirements/doc.txt index b65f4b3..47df10a 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -1,86 +1,83 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -accessible-pygments==0.0.4 +accessible-pygments==0.0.5 # via pydata-sphinx-theme -alabaster==0.7.13 +alabaster==1.0.0 # via sphinx asgiref==3.8.1 # via # -r requirements/test.txt # django -babel==2.14.0 +babel==2.16.0 # via # pydata-sphinx-theme # sphinx -backports-zoneinfo==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # -r requirements/test.txt - # django +backports-tarfile==1.2.0 + # via jaraco-context beautifulsoup4==4.12.3 # via pydata-sphinx-theme -certifi==2024.2.2 +certifi==2024.8.30 # via requests -charset-normalizer==3.3.2 +cffi==1.17.1 + # via cryptography +charset-normalizer==3.4.0 # via requests click==8.1.7 # via -r requirements/test.txt -coverage[toml]==7.4.4 +coverage[toml]==7.6.7 # via # -r requirements/test.txt # pytest-cov -django==4.2.11 +cryptography==43.0.3 + # via secretstorage +django==4.2.16 # via # -c requirements/common_constraints.txt # -r requirements/test.txt -doc8==1.1.1 +doc8==1.1.2 # via -r requirements/doc.in -docutils==0.19 +docutils==0.21.2 # via # doc8 # pydata-sphinx-theme # readme-renderer # restructuredtext-lint # sphinx -exceptiongroup==1.2.0 - # via - # -r requirements/test.txt - # pytest -idna==3.6 +idna==3.10 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.11.0 +importlib-metadata==8.5.0 # via - # -c requirements/common_constraints.txt # keyring - # sphinx # twine -importlib-resources==6.4.0 - # via keyring iniconfig==2.0.0 # via # -r requirements/test.txt # pytest jaraco-classes==3.4.0 # via keyring -jaraco-context==4.3.0 +jaraco-context==6.0.1 # via keyring -jaraco-functools==4.0.0 +jaraco-functools==4.1.0 # via keyring -jinja2==3.1.3 +jeepney==0.8.0 + # via + # keyring + # secretstorage +jinja2==3.1.4 # via # -r requirements/test.txt # sphinx -keyring==25.0.0 +keyring==25.5.0 # via twine markdown-it-py==3.0.0 # via rich -markupsafe==2.1.5 +markupsafe==3.0.2 # via # -r requirements/test.txt # jinja2 @@ -88,31 +85,32 @@ mdurl==0.1.2 # via markdown-it-py mock==5.1.0 # via -r requirements/test.txt -more-itertools==10.2.0 +more-itertools==10.5.0 # via # jaraco-classes # jaraco-functools -nh3==0.2.17 +nh3==0.2.18 # via readme-renderer -packaging==24.0 +packaging==24.2 # via # -r requirements/test.txt - # pydata-sphinx-theme # pytest # sphinx -pbr==6.0.0 +pbr==6.1.0 # via # -r requirements/test.txt # stevedore pkginfo==1.10.0 # via twine -pluggy==1.4.0 +pluggy==1.5.0 # via # -r requirements/test.txt # pytest -pydata-sphinx-theme==0.14.4 +pycparser==2.22 + # via cffi +pydata-sphinx-theme==0.16.0 # via sphinx-book-theme -pygments==2.17.2 +pygments==2.18.0 # via # accessible-pygments # doc8 @@ -120,21 +118,19 @@ pygments==2.17.2 # readme-renderer # rich # sphinx -pytest==8.1.1 +pytest==8.3.3 # via # -r requirements/test.txt # pytest-cov -pytest-cov==5.0.0 +pytest-cov==6.0.0 # via -r requirements/test.txt python-slugify==8.0.4 # via -r requirements/test.txt -pytz==2024.1 - # via babel -pyyaml==6.0.1 +pyyaml==6.0.2 # via -r requirements/test.txt -readme-renderer==43.0 +readme-renderer==44.0 # via twine -requests==2.31.0 +requests==2.32.3 # via # requests-toolbelt # sphinx @@ -145,36 +141,38 @@ restructuredtext-lint==1.4.0 # via doc8 rfc3986==2.0.0 # via twine -rich==13.7.1 +rich==13.9.4 # via twine +secretstorage==3.3.3 + # via keyring snowballstemmer==2.2.0 # via sphinx -soupsieve==2.5 +soupsieve==2.6 # via beautifulsoup4 -sphinx==6.2.1 +sphinx==8.1.3 # via # -r requirements/doc.in # pydata-sphinx-theme # sphinx-book-theme -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.3 # via -r requirements/doc.in -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==2.0.0 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==2.0.0 # via sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.1.0 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==2.0.0 # via sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==2.0.0 # via sphinx -sqlparse==0.4.4 +sqlparse==0.5.2 # via # -r requirements/test.txt # django -stevedore==5.2.0 +stevedore==5.3.0 # via # -r requirements/test.txt # doc8 @@ -182,25 +180,13 @@ text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify -tomli==2.0.1 - # via - # -r requirements/test.txt - # coverage - # doc8 - # pytest -twine==5.0.0 +twine==5.1.1 # via -r requirements/doc.in -typing-extensions==4.10.0 - # via - # -r requirements/test.txt - # asgiref - # pydata-sphinx-theme - # rich -urllib3==2.2.1 +typing-extensions==4.12.2 + # via pydata-sphinx-theme +urllib3==2.2.3 # via # requests # twine -zipp==3.18.1 - # via - # importlib-metadata - # importlib-resources +zipp==3.21.0 + # via importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 6401f54..dc539c5 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,34 +1,23 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -build==1.2.1 +build==1.2.2.post1 # 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 +packaging==24.2 # 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 +pyproject-hooks==1.2.0 # via # build # pip-tools - # pyproject-hooks -wheel==0.43.0 +wheel==0.45.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/pip.txt b/requirements/pip.txt index cf44902..dd22047 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,14 +1,16 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -wheel==0.43.0 +wheel==0.45.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.2.0 +pip==24.2 + # via + # -c /home/runner/work/code-annotations/code-annotations/requirements/common_constraints.txt + # -r requirements/pip.in +setuptools==75.5.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 7e0a746..eec18ae 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -8,15 +8,10 @@ asgiref==3.8.1 # via # -r requirements/test.txt # django -astroid==3.1.0 +astroid==3.3.5 # via # pylint # pylint-celery -backports-zoneinfo==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # -r requirements/test.txt - # django click==8.1.7 # via # -r requirements/test.txt @@ -25,24 +20,20 @@ click==8.1.7 # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==1.7.0 +code-annotations==1.8.2 # via edx-lint -coverage[toml]==7.4.4 +coverage[toml]==7.6.7 # via # -r requirements/test.txt # pytest-cov -dill==0.3.8 +dill==0.3.9 # via pylint -django==4.2.11 +django==4.2.16 # via # -c requirements/common_constraints.txt # -r requirements/test.txt -edx-lint==5.3.6 +edx-lint==5.4.1 # via -r requirements/quality.in -exceptiongroup==1.2.0 - # via - # -r requirements/test.txt - # pytest iniconfig==2.0.0 # via # -r requirements/test.txt @@ -51,11 +42,11 @@ isort==5.13.2 # via # -r requirements/quality.in # pylint -jinja2==3.1.3 +jinja2==3.1.4 # via # -r requirements/test.txt # code-annotations -markupsafe==2.1.5 +markupsafe==3.0.2 # via # -r requirements/test.txt # jinja2 @@ -63,25 +54,25 @@ mccabe==0.7.0 # via pylint mock==5.1.0 # via -r requirements/test.txt -packaging==24.0 +packaging==24.2 # via # -r requirements/test.txt # pytest -pbr==6.0.0 +pbr==6.1.0 # via # -r requirements/test.txt # stevedore -platformdirs==4.2.0 +platformdirs==4.3.6 # via pylint -pluggy==1.4.0 +pluggy==1.5.0 # via # -r requirements/test.txt # pytest -pycodestyle==2.11.1 +pycodestyle==2.12.1 # via -r requirements/quality.in pydocstyle==6.3.0 # via -r requirements/quality.in -pylint==3.1.0 +pylint==3.3.1 # via # edx-lint # pylint-celery @@ -89,23 +80,23 @@ pylint==3.1.0 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.5.5 +pylint-django==2.6.1 # via edx-lint pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django -pytest==8.1.1 +pytest==8.3.3 # via # -r requirements/test.txt # pytest-cov -pytest-cov==5.0.0 +pytest-cov==6.0.0 # via -r requirements/test.txt python-slugify==8.0.4 # via # -r requirements/test.txt # code-annotations -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -r requirements/test.txt # code-annotations @@ -113,11 +104,11 @@ six==1.16.0 # via edx-lint snowballstemmer==2.2.0 # via pydocstyle -sqlparse==0.4.4 +sqlparse==0.5.2 # via # -r requirements/test.txt # django -stevedore==5.2.0 +stevedore==5.3.0 # via # -r requirements/test.txt # code-annotations @@ -125,17 +116,5 @@ text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify -tomli==2.0.1 - # via - # -r requirements/test.txt - # coverage - # pylint - # pytest -tomlkit==0.12.4 +tomlkit==0.13.2 # via pylint -typing-extensions==4.10.0 - # via - # -r requirements/test.txt - # asgiref - # astroid - # pylint diff --git a/requirements/test.txt b/requirements/test.txt index e1435c5..9e3af13 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -8,61 +8,46 @@ asgiref==3.8.1 # via # -r requirements/django.txt # django -backports-zoneinfo==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # -r requirements/django.txt - # django click==8.1.7 # via -r requirements/base.txt -coverage[toml]==7.4.4 +coverage[toml]==7.6.7 # via pytest-cov # via # -c requirements/common_constraints.txt # -r requirements/django.txt -exceptiongroup==1.2.0 - # via pytest iniconfig==2.0.0 # via pytest -jinja2==3.1.3 +jinja2==3.1.4 # via -r requirements/base.txt -markupsafe==2.1.5 +markupsafe==3.0.2 # via # -r requirements/base.txt # jinja2 mock==5.1.0 # via -r requirements/test.in -packaging==24.0 +packaging==24.2 # via pytest -pbr==6.0.0 +pbr==6.1.0 # via # -r requirements/base.txt # stevedore -pluggy==1.4.0 +pluggy==1.5.0 # via pytest -pytest==8.1.1 +pytest==8.3.3 # via pytest-cov -pytest-cov==5.0.0 +pytest-cov==6.0.0 # via -r requirements/test.in python-slugify==8.0.4 # via -r requirements/base.txt -pyyaml==6.0.1 +pyyaml==6.0.2 # via -r requirements/base.txt -sqlparse==0.4.4 +sqlparse==0.5.2 # via # -r requirements/django.txt # django -stevedore==5.2.0 +stevedore==5.3.0 # via -r requirements/base.txt text-unidecode==1.3 # via # -r requirements/base.txt # python-slugify -tomli==2.0.1 - # via - # coverage - # pytest -typing-extensions==4.10.0 - # via - # -r requirements/django.txt - # asgiref From d0eb7e14d22e1c3b7ec18b1de025bb0fa3e0bcd9 Mon Sep 17 00:00:00 2001 From: Brian Mesick Date: Wed, 20 Nov 2024 11:03:16 -0500 Subject: [PATCH 2/3] style: Update pylintrc Some names have changed since we last updated pylint here. These changes don't change any previous behavior but should let linting pass again. --- pylintrc | 9 +- pylintrc_backup | 457 ------------------------------------------------ pylintrc_tweaks | 2 +- 3 files changed, 6 insertions(+), 462 deletions(-) delete mode 100644 pylintrc_backup diff --git a/pylintrc b/pylintrc index 561027b..ebd5734 100644 --- a/pylintrc +++ b/pylintrc @@ -64,7 +64,7 @@ # SERIOUSLY. # # ------------------------------ -# Generated by edx-lint version: 5.2.5 +# Generated by edx-lint version: 5.4.1 # ------------------------------ [MASTER] ignore = ,migrations, settings, wsgi.py @@ -259,6 +259,7 @@ enable = useless-suppression, disable = bad-indentation, + broad-exception-raised, consider-using-f-string, duplicate-code, file-ignored, @@ -285,7 +286,7 @@ disable = feature-toggle-needs-doc, illegal-waffle-usage, - logging-fstring-interpolation,,invalid-name,useless-object-inheritance,django-not-configured,consider-using-dict-items,consider-using-with + logging-fstring-interpolation,,invalid-name,useless-object-inheritance,django-not-configured,consider-using-dict-items,consider-using-with,too-many-positional-arguments,broad-exception-caught [REPORTS] output-format = text @@ -380,6 +381,6 @@ ext-import-graph = int-import-graph = [EXCEPTIONS] -overgeneral-exceptions = Exception +overgeneral-exceptions = builtins.Exception -# b74f2c15b5d64df07c4c2e83ccdb285a46f90e11 +# b9cecc5f9bd493dd71f905f023b38158c7003088 diff --git a/pylintrc_backup b/pylintrc_backup deleted file mode 100644 index dff7f43..0000000 --- a/pylintrc_backup +++ /dev/null @@ -1,457 +0,0 @@ -# *************************** -# ** DO NOT EDIT THIS FILE ** -# *************************** -# -# This file was generated by edx-lint: http://github.com/openedx/edx-lint -# -# If you want to change this file, you have two choices, depending on whether -# you want to make a local change that applies only to this repo, or whether -# you want to make a central change that applies to all repos using edx-lint. -# -# LOCAL CHANGE: -# -# 1. Edit the local pylintrc_tweaks file to add changes just to this -# repo's file. -# -# 2. Run: -# -# $ edx_lint write pylintrc -# -# 3. This will modify the local file. Submit a pull request to get it -# checked in so that others will benefit. -# -# -# CENTRAL CHANGE: -# -# 1. Edit the pylintrc file in the edx-lint repo at -# https://github.com/openedx/edx-lint/blob/master/edx_lint/files/pylintrc -# -# 2. install the updated version of edx-lint (in edx-lint): -# -# $ pip install . -# -# 3. Run (in edx-lint): -# -# # uses pylintrc_tweaks from edx-lint for linting in edx-lint -# # NOTE: Use Python 3.x, which no longer includes comments in the output file -# $ edx_lint write pylintrc -# -# 4. Make a new version of edx_lint, submit and review a pull request with the -# pylintrc update, and after merging, update the edx-lint version by -# creating a new tag in the repo (uses pbr). -# -# 5. In your local repo, install the newer version of edx-lint. -# -# 6. Run: -# -# # uses local pylintrc_tweaks -# $ edx_lint write pylintrc -# -# 7. This will modify the local file. Submit a pull request to get it -# checked in so that others will benefit. -# -# -# -# -# -# STAY AWAY FROM THIS FILE! -# -# -# -# -# -# SERIOUSLY. -# -# ------------------------------ -[MASTER] -ignore = ,migrations, settings, wsgi.py -persistent = yes -load-plugins = edx_lint.pylint,pylint_django,pylint_celery - -[MESSAGES CONTROL] -enable = - blacklisted-name, - line-too-long, - - syntax-error, - init-is-generator, - return-in-init, - function-redefined, - not-in-loop, - return-outside-function, - yield-outside-function, - return-arg-in-generator, - nonexistent-operator, - duplicate-argument-name, - abstract-class-instantiated, - bad-reversed-sequence, - continue-in-finally, - method-hidden, - access-member-before-definition, - no-method-argument, - no-self-argument, - invalid-slots-object, - assigning-non-slot, - invalid-slots, - inherit-non-class, - inconsistent-mro, - duplicate-bases, - non-iterator-returned, - unexpected-special-method-signature, - invalid-length-returned, - import-error, - used-before-assignment, - undefined-variable, - undefined-all-variable, - invalid-all-object, - no-name-in-module, - unbalance-tuple-unpacking, - unpacking-non-sequence, - bad-except-order, - raising-bad-type, - misplaced-bare-raise, - raising-non-exception, - nonimplemented-raised, - catching-non-exception, - slots-on-old-class, - super-on-old-class, - bad-super-call, - missing-super-argument, - no-member, - not-callable, - assignment-from-no-return, - no-value-for-parameter, - too-many-function-args, - unexpected-keyword-arg, - redundant-keyword-arg, - invalid-sequence-index, - invalid-slice-index, - assignment-from-none, - not-context-manager, - invalid-unary-operand-type, - unsupported-binary-operation, - repeated-keyword, - not-an-iterable, - not-a-mapping, - unsupported-membership-test, - unsubscriptable-object, - logging-unsupported-format, - logging-too-many-args, - logging-too-few-args, - bad-format-character, - truncated-format-string, - mixed-fomat-string, - format-needs-mapping, - missing-format-string-key, - too-many-format-args, - too-few-format-args, - bad-str-strip-call, - model-unicode-not-callable, - super-method-not-called, - non-parent-method-called, - test-inherits-tests, - translation-of-non-string, - redefined-variable-type, - cyclical-import, - unreachable, - dangerous-default-value, - pointless-statement, - pointless-string-statement, - expression-not-assigned, - duplicate-key, - confusing-with-statement, - using-constant-test, - lost-exception, - assert-on-tuple, - attribute-defined-outside-init, - bad-staticmethod-argument, - arguments-differ, - signature-differs, - abstract-method, - super-init-not-called, - relative-import, - import-self, - misplaced-future, - invalid-encoded-data, - global-variable-undefined, - redefined-outer-name, - redefined-builtin, - redefined-in-handler, - undefined-loop-variable, - cell-var-from-loop, - duplicate-except, - nonstandard-exception, - binary-op-exception, - property-on-old-class, - bad-format-string-key, - unused-format-string-key, - bad-format-string, - missing-format-argument-key, - unused-format-string-argument, - format-combined-specification, - missing-format-attribute, - invalid-format-index, - anomalous-backslash-in-string, - anomalous-unicode-escape-in-string, - bad-open-mode, - boolean-datetime, - - fatal, - astroid-error, - parse-error, - method-check-failed, - django-not-available, - raw-checker-failed, - django-not-available-placeholder, - - empty-docstring, - invalid-characters-in-docstring, - missing-docstring, - wrong-spelling-in-comment, - wrong-spelling-in-docstring, - - unused-import, - unused-variable, - unused-argument, - - exec-used, - eval-used, - - bad-classmethod-argument, - bad-mcs-classmethod-argument, - bad-mcs-method-argument, - bad-whitespace, - consider-iterating-dictionary, - consider-using-enumerate, - literal-used-as-attribute, - multiple-imports, - multiple-statements, - old-style-class, - simplifiable-range, - singleton-comparison, - superfluous-parens, - unidiomatic-typecheck, - unneeded-not, - wrong-assert-type, - simplifiable-if-statement, - no-classmethod-decorator, - no-staticmethod-decorator, - unnecessary-pass, - unnecessary-lambda, - useless-else-on-loop, - unnecessary-semicolon, - reimported, - global-variable-not-assigned, - global-at-module-level, - bare-except, - broad-except, - logging-not-lazy, - redundant-unittest-assert, - model-missing-unicode, - model-has-unicode, - model-no-explicit-unicode, - protected-access, - - deprecated-module, - deprecated-method, - - too-many-nested-blocks, - too-many-statements, - too-many-boolean-expressions, - - wrong-import-order, - wrong-import-position, - wildcard-import, - - missing-final-newline, - mixed-line-endings, - trailing-newlines, - trailing-whitespace, - unexpected-line-ending-format, - mixed-indentation, - - bad-option-value, - unrecognized-inline-option, - useless-suppression, - bad-inline-option, - deprecated-pragma, -disable = - bad-continuation, - invalid-name, - misplaced-comparison-constant, - file-ignored, - bad-indentation, - lowercase-l-suffix, - unused-wildcard-import, - global-statement, - no-else-return, - django-not-configured, - - apply-builtin, - backtick, - basestring-builtin, - buffer-builtin, - cmp-builtin, - cmp-method, - coerce-builtin, - coerce-method, - delslice-method, - dict-iter-method, - dict-view-method, - duplicate-code, - execfile-builtin, - feature-toggle-needs-doc, - file-builtin, - filter-builtin-not-iterating, - fixme, - getslice-method, - hex-method, - illegal-waffle-usage, - import-star-module-level, - indexing-exception, - input-builtin, - intern-builtin, - locally-disabled, - locally-enabled, - logging-format-interpolation, - long-builtin, - long-suffix, - map-builtin-not-iterating, - metaclass-assignment, - next-method-called, - no-absolute-import, - no-init, - no-self-use, - nonzero-method, - oct-method, - old-division, - old-ne-operator, - old-octal-literal, - old-raise-syntax, - parameter-unpacking, - print-statement, - raising-string, - range-builtin-not-iterating, - raw_input-builtin, - reduce-builtin, - reload-builtin, - round-builtin, - setslice-method, - standarderror-builtin, - suppressed-message, - too-few-public-methods, - too-many-ancestors, - too-many-arguments, - too-many-branches, - too-many-instance-attributes, - too-many-lines, - too-many-locals, - too-many-public-methods, - too-many-return-statements, - ungrouped-imports, - unichr-builtin, - unicode-builtin, - unpacking-in-except, - using-cmp-argument, - xrange-builtin, - zip-builtin-not-iterating,,invalid-name,useless-object-inheritance - -[REPORTS] -output-format = text -files-output = no -reports = no -evaluation = 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) - -[BASIC] -bad-functions = map,filter,apply,input -module-rgx = (([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ -const-rgx = (([A-Z_][A-Z0-9_]*)|(__.*__)|log|urlpatterns|logger|User)$ -class-rgx = [A-Z_][a-zA-Z0-9]+$ -function-rgx = ([a-z_][a-z0-9_]{2,40}|test_[a-z0-9_]+)$ -method-rgx = ([a-z_][a-z0-9_]{2,40}|setUp|set[Uu]pClass|tearDown|tear[Dd]ownClass|assert[A-Z]\w*|maxDiff|test_[a-z0-9_]+)$ -attr-rgx = [a-z_][a-z0-9_]{2,30}$ -argument-rgx = [a-z_][a-z0-9_]{2,30}$ -variable-rgx = [a-z_][a-z0-9_]{2,30}$ -class-attribute-rgx = ([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ -inlinevar-rgx = [A-Za-z_][A-Za-z0-9_]*$ -good-names = f,i,j,k,db,ex,Run,_,__ -bad-names = foo,bar,baz,toto,tutu,tata -no-docstring-rgx = __.*__$|test_.+|setUp$|setUpClass$|tearDown$|tearDownClass$|Meta$ -docstring-min-length = 5 - -[FORMAT] -max-line-length = 120 -ignore-long-lines = ^\s*(# )?((?)|(\.\. \w+: .*))$ -single-line-if-stmt = no -no-space-check = trailing-comma,dict-separator -max-module-lines = 1000 -indent-string = ' ' - -[MISCELLANEOUS] -notes = FIXME,XXX,TODO - -[SIMILARITIES] -min-similarity-lines = 4 -ignore-comments = yes -ignore-docstrings = yes -ignore-imports = no - -[TYPECHECK] -ignore-mixin-members = yes -ignored-classes = SQLObject -unsafe-load-any-extension = yes -generated-members = - REQUEST, - acl_users, - aq_parent, - objects, - DoesNotExist, - can_read, - can_write, - get_url, - size, - content, - status_code, - create, - build, - fields, - tag, - org, - course, - category, - name, - revision, - _meta, - -[VARIABLES] -init-import = no -dummy-variables-rgx = _|dummy|unused|.*_unused -additional-builtins = - -[CLASSES] -defining-attr-methods = __init__,__new__,setUp -valid-classmethod-first-arg = cls -valid-metaclass-classmethod-first-arg = mcs - -[DESIGN] -max-args = 5 -ignored-argument-names = _.* -max-locals = 15 -max-returns = 6 -max-branches = 12 -max-statements = 50 -max-parents = 7 -max-attributes = 7 -min-public-methods = 2 -max-public-methods = 20 - -[IMPORTS] -deprecated-modules = regsub,TERMIOS,Bastion,rexec -import-graph = -ext-import-graph = -int-import-graph = - -[EXCEPTIONS] -overgeneral-exceptions = Exception - -# 2baa8e2454b99e258f3d547e787ce30ef4557e22 diff --git a/pylintrc_tweaks b/pylintrc_tweaks index 62efd5b..ff5169d 100644 --- a/pylintrc_tweaks +++ b/pylintrc_tweaks @@ -6,4 +6,4 @@ ignore+= ,migrations, settings, wsgi.py const-rgx = (([A-Z_][A-Z0-9_]*)|(__.*__)|log|urlpatterns|logger|User)$ [MESSAGES CONTROL] -DISABLE+= ,invalid-name,useless-object-inheritance,django-not-configured,consider-using-dict-items,consider-using-with +DISABLE+= ,invalid-name,useless-object-inheritance,django-not-configured,consider-using-dict-items,consider-using-with,too-many-positional-arguments,broad-exception-caught From f47385d1cac46fba018e7ba27dfc5c5ccb96a35e Mon Sep 17 00:00:00 2001 From: Brian Mesick Date: Wed, 20 Nov 2024 11:23:11 -0500 Subject: [PATCH 3/3] build: Update Read the Docs to Py 3.12 --- .readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 9d34bd5..c8610f8 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -12,7 +12,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.12" python: install: