From ba99fbf598247eee17ff0a4f3fc1a6bf9000059b Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 22 Sep 2024 22:29:20 -0400 Subject: [PATCH 1/2] chore: Upgrade Python requirements --- requirements/base.txt | 4 ++-- requirements/ci.txt | 10 +++++----- requirements/dev.txt | 18 +++++++++--------- requirements/doc.txt | 6 +++--- requirements/pip.txt | 2 +- requirements/quality.txt | 10 +++++----- requirements/test.txt | 4 ++-- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index b651f90..a7ff74d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -56,7 +56,7 @@ markupsafe==2.1.5 # via jinja2 newrelic==9.13.0 # via edx-django-utils -openedx-events==9.14.0 +openedx-events==9.14.1 # via -r requirements/base.in pbr==6.1.0 # via stevedore @@ -64,7 +64,7 @@ psutil==6.0.0 # via edx-django-utils pycparser==2.22 # via cffi -pymongo==4.8.0 +pymongo==4.9.1 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils diff --git a/requirements/ci.txt b/requirements/ci.txt index 6c95789..3625d4c 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -12,7 +12,7 @@ colorama==0.4.6 # via tox distlib==0.3.8 # via virtualenv -filelock==3.16.0 +filelock==3.16.1 # via # tox # virtualenv @@ -20,15 +20,15 @@ packaging==24.1 # via # pyproject-api # tox -platformdirs==4.3.3 +platformdirs==4.3.6 # via # tox # virtualenv pluggy==1.5.0 # via tox -pyproject-api==1.7.1 +pyproject-api==1.8.0 # via tox -tox==4.18.1 +tox==4.20.0 # via -r requirements/ci.in -virtualenv==20.26.4 +virtualenv==20.26.5 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 0c884e0..b91b243 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,7 +8,7 @@ asgiref==3.8.1 # via # -r requirements/quality.txt # django -astroid==3.2.4 +astroid==3.3.3 # via # -r requirements/quality.txt # pylint @@ -120,7 +120,7 @@ fastavro==1.9.7 # via # -r requirements/quality.txt # openedx-events -filelock==3.16.0 +filelock==3.16.1 # via # -r requirements/ci.txt # tox @@ -156,7 +156,7 @@ newrelic==9.13.0 # via # -r requirements/quality.txt # edx-django-utils -openedx-events==9.14.0 +openedx-events==9.14.1 # via -r requirements/quality.txt packaging==24.1 # via @@ -175,7 +175,7 @@ pbr==6.1.0 # stevedore pip-tools==7.4.1 # via -r requirements/pip-tools.txt -platformdirs==4.3.3 +platformdirs==4.3.6 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -205,7 +205,7 @@ pydocstyle==6.3.0 # via -r requirements/quality.txt pygments==2.18.0 # via diff-cover -pylint==3.2.7 +pylint==3.3.0 # via # -r requirements/quality.txt # edx-lint @@ -225,7 +225,7 @@ pylint-plugin-utils==0.8.2 # -r requirements/quality.txt # pylint-celery # pylint-django -pymongo==4.8.0 +pymongo==4.9.1 # via # -r requirements/quality.txt # edx-opaque-keys @@ -233,7 +233,7 @@ pynacl==1.5.0 # via # -r requirements/quality.txt # edx-django-utils -pyproject-api==1.7.1 +pyproject-api==1.8.0 # via # -r requirements/ci.txt # tox @@ -291,13 +291,13 @@ tomlkit==0.13.2 # via # -r requirements/quality.txt # pylint -tox==4.18.1 +tox==4.20.0 # via -r requirements/ci.txt typing-extensions==4.12.2 # via # -r requirements/quality.txt # edx-opaque-keys -virtualenv==20.26.4 +virtualenv==20.26.5 # via # -r requirements/ci.txt # tox diff --git a/requirements/doc.txt b/requirements/doc.txt index 5ac9b56..feb70d5 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -127,7 +127,7 @@ jinja2==3.1.4 # -r requirements/test.txt # code-annotations # sphinx -keyring==25.3.0 +keyring==25.4.1 # via twine markdown-it-py==3.0.0 # via rich @@ -147,7 +147,7 @@ newrelic==9.13.0 # edx-django-utils nh3==0.2.18 # via readme-renderer -openedx-events==9.14.0 +openedx-events==9.14.1 # via -r requirements/test.txt packaging==24.1 # via @@ -183,7 +183,7 @@ pygments==2.18.0 # readme-renderer # rich # sphinx -pymongo==4.8.0 +pymongo==4.9.1 # via # -r requirements/test.txt # edx-opaque-keys diff --git a/requirements/pip.txt b/requirements/pip.txt index ec02f2b..36c777e 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,5 +10,5 @@ wheel==0.44.0 # The following packages are considered to be unsafe in a requirements file: pip==24.2 # via -r requirements/pip.in -setuptools==75.0.0 +setuptools==75.1.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 8b4ab47..3492955 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -8,7 +8,7 @@ asgiref==3.8.1 # via # -r requirements/test.txt # django -astroid==3.2.4 +astroid==3.3.3 # via # pylint # pylint-celery @@ -109,7 +109,7 @@ newrelic==9.13.0 # via # -r requirements/test.txt # edx-django-utils -openedx-events==9.14.0 +openedx-events==9.14.1 # via -r requirements/test.txt packaging==24.1 # via @@ -119,7 +119,7 @@ pbr==6.1.0 # via # -r requirements/test.txt # stevedore -platformdirs==4.3.3 +platformdirs==4.3.6 # via pylint pluggy==1.5.0 # via @@ -137,7 +137,7 @@ pycparser==2.22 # cffi pydocstyle==6.3.0 # via -r requirements/quality.in -pylint==3.2.7 +pylint==3.3.0 # via # edx-lint # pylint-celery @@ -151,7 +151,7 @@ pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django -pymongo==4.8.0 +pymongo==4.9.1 # via # -r requirements/test.txt # edx-opaque-keys diff --git a/requirements/test.txt b/requirements/test.txt index 3aaa05a..45c4792 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -86,7 +86,7 @@ newrelic==9.13.0 # via # -r requirements/base.txt # edx-django-utils -openedx-events==9.14.0 +openedx-events==9.14.1 # via -r requirements/base.txt packaging==24.1 # via pytest @@ -104,7 +104,7 @@ pycparser==2.22 # via # -r requirements/base.txt # cffi -pymongo==4.8.0 +pymongo==4.9.1 # via # -r requirements/base.txt # edx-opaque-keys From 909e2d6cc9acd60c4d732b06c4dd43304f9f361a Mon Sep 17 00:00:00 2001 From: Brian Mesick Date: Mon, 23 Sep 2024 10:16:07 -0400 Subject: [PATCH 2/2] style: Update linting for newest pylint / edx-lint --- edx_event_bus_redis/internal/consumer.py | 2 +- pylintrc | 8 +++++--- pylintrc_tweaks | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/edx_event_bus_redis/internal/consumer.py b/edx_event_bus_redis/internal/consumer.py index d55abb7..df161b8 100644 --- a/edx_event_bus_redis/internal/consumer.py +++ b/edx_event_bus_redis/internal/consumer.py @@ -186,7 +186,7 @@ def _consume_indefinitely(self): 'consumer_name': self.consumer_name, } - try: # pylint: disable=too-many-nested-blocks + try: logger.info(f"Running consumer for {run_context!r}") # How many errors have we seen in a row? If this climbs too high, exit with error. diff --git a/pylintrc b/pylintrc index 6dde361..469c401 100644 --- a/pylintrc +++ b/pylintrc @@ -64,7 +64,7 @@ # SERIOUSLY. # # ------------------------------ -# Generated by edx-lint version: 5.3.0 +# Generated by edx-lint version: 5.3.6 # ------------------------------ [MASTER] ignore = migrations @@ -259,6 +259,7 @@ enable = useless-suppression, disable = bad-indentation, + broad-exception-raised, consider-using-f-string, duplicate-code, file-ignored, @@ -376,6 +377,7 @@ max-parents = 7 max-attributes = 7 min-public-methods = 2 max-public-methods = 20 +max-positional-arguments = 10 [IMPORTS] deprecated-modules = regsub,TERMIOS,Bastion,rexec @@ -384,6 +386,6 @@ ext-import-graph = int-import-graph = [EXCEPTIONS] -overgeneral-exceptions = Exception +overgeneral-exceptions = builtins.Exception -# 46c7367b47aae914d36c17c49c676bffbc597fcd +# 4cac938bf878bc7ac3b1c8ca5875b8dc6e1088d4 diff --git a/pylintrc_tweaks b/pylintrc_tweaks index 7b6eb35..a131f62 100644 --- a/pylintrc_tweaks +++ b/pylintrc_tweaks @@ -9,3 +9,6 @@ disable+= django-not-configured, consider-using-with, bad-option-value, + +[DESIGN] +max-positional-arguments = 10