From 6dfd7a0cb689855dbdcfc5e7f5da12fad8ed6bd0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 10:34:20 +0000 Subject: [PATCH 1/2] Bump pylint from 2.17.7 to 3.0.0 Bumps [pylint](https://github.com/pylint-dev/pylint) from 2.17.7 to 3.0.0. - [Release notes](https://github.com/pylint-dev/pylint/releases) - [Commits](https://github.com/pylint-dev/pylint/compare/v2.17.7...v3.0.0) --- updated-dependencies: - dependency-name: pylint dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements/lint.txt | 340 +++++++++++++++++++++--------------------- 1 file changed, 168 insertions(+), 172 deletions(-) diff --git a/requirements/lint.txt b/requirements/lint.txt index b9a49a82..43282a53 100644 --- a/requirements/lint.txt +++ b/requirements/lint.txt @@ -6,67 +6,67 @@ # alembic==1.12.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt amqp==5.1.1 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # kombu -astroid==2.15.8 +astroid==3.0.0 # via pylint attrs==21.4.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # jsonschema backports-zoneinfo[tzdata]==0.2.1 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # celery # kombu beautifulsoup4==4.9.3 # via - # -r tests.txt + # -r requirements/tests.txt # webtest billiard==4.1.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # celery build==0.8.0 # via - # -r tests.txt + # -r requirements/tests.txt # pip-tools cachetools==4.2.1 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # google-auth celery==5.3.4 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt certifi==2023.7.22 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # requests # sentry-sdk charset-normalizer==2.0.1 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # requests checkmatelib==1.0.15 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt click==8.1.3 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # celery # click-didyoumean # click-plugins @@ -74,219 +74,217 @@ click==8.1.3 # pip-tools click-didyoumean==0.3.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # celery click-plugins==1.1.1 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # celery click-repl==0.2.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # celery coverage==7.3.2 - # via -r tests.txt + # via -r requirements/tests.txt dill==0.3.4 # via pylint exceptiongroup==1.0.0 # via - # -r tests.txt + # -r requirements/tests.txt # pytest factory-boy==3.3.0 - # via -r tests.txt + # via -r requirements/tests.txt faker==4.17.1 # via - # -r tests.txt + # -r requirements/tests.txt # factory-boy google-auth==1.24.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # google-auth-oauthlib google-auth-oauthlib==0.4.4 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # pyramid-googleauth greenlet==1.0.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # sqlalchemy gunicorn==21.2.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt h-matchers==1.2.15 - # via -r tests.txt + # via -r requirements/tests.txt h-pyramid-sentry==1.2.4 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt httpretty==1.1.4 - # via -r tests.txt + # via -r requirements/tests.txt hupper==1.10.2 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # pyramid idna==2.10 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # requests importlib-metadata==4.8.1 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # alembic # pip-sync-faster importlib-resources==6.1.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # alembic # checkmatelib # jsonschema iniconfig==1.1.1 # via - # -r tests.txt + # -r requirements/tests.txt # pytest isort==5.12.0 # via pylint jinja2==2.11.3 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # pyramid-jinja2 jsonschema==4.4.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # checkmatelib kombu==5.3.2 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # celery -lazy-object-proxy==1.6.0 - # via astroid mako==1.2.2 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # alembic markupsafe==1.1.1 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # jinja2 # mako # pyramid-jinja2 marshmallow==3.10.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # marshmallow-jsonapi marshmallow-jsonapi==0.24.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt mccabe==0.6.1 # via pylint netaddr==0.8.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # checkmatelib newrelic==9.1.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt oauthlib==3.1.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # requests-oauthlib packaging==23.1 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # build # gunicorn # pytest # zope-sqlalchemy pastedeploy==2.1.1 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # plaster-pastedeploy pep517==0.13.0 # via - # -r tests.txt + # -r requirements/tests.txt # build pip-sync-faster==0.0.3 # via - # -r lint.in - # -r tests.txt + # -r requirements/lint.in + # -r requirements/tests.txt pip-tools==7.3.0 # via - # -r lint.in - # -r tests.txt + # -r requirements/lint.in + # -r requirements/tests.txt # pip-sync-faster plaster==1.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # plaster-pastedeploy # pyramid plaster-pastedeploy==0.7 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # pyramid platformdirs==2.2.0 # via pylint pluggy==0.13.1 # via - # -r tests.txt + # -r requirements/tests.txt # pytest prompt-toolkit==3.0.8 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # click-repl psycopg2==2.9.8 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt pyasn1==0.4.8 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # pyasn1-modules # rsa pyasn1-modules==0.2.8 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # google-auth pydocstyle==6.3.0 - # via -r lint.in + # via -r requirements/lint.in pyjwt==2.4.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # pyramid-googleauth -pylint==2.17.7 - # via -r lint.in +pylint==3.0.0 + # via -r requirements/lint.in pyramid==2.0.2 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # h-pyramid-sentry # pyramid-exclog # pyramid-googleauth @@ -296,66 +294,66 @@ pyramid==2.0.2 # pyramid-tm pyramid-exclog==1.1 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt pyramid-googleauth==1.0.5 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt pyramid-jinja2==2.10 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt pyramid-sanity==1.0.3 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt pyramid-services==2.2 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt pyramid-tm==2.5 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt pyrsistent==0.18.1 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # jsonschema pytest==7.4.2 - # via -r tests.txt + # via -r requirements/tests.txt python-dateutil==2.8.2 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # celery # faker requests==2.31.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # checkmatelib # requests-oauthlib requests-oauthlib==1.3.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # google-auth-oauthlib rsa==4.7 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # google-auth sentry-sdk==1.14.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # h-pyramid-sentry six==1.15.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # click-repl # google-auth # python-dateutil @@ -363,21 +361,21 @@ snowballstemmer==2.2.0 # via pydocstyle soupsieve==2.0.1 # via - # -r tests.txt + # -r requirements/tests.txt # beautifulsoup4 sqlalchemy==2.0.21 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # alembic # zope-sqlalchemy text-unidecode==1.3 # via - # -r tests.txt + # -r requirements/tests.txt # faker tomli==2.0.0 # via - # -r tests.txt + # -r requirements/tests.txt # build # pep517 # pip-tools @@ -387,19 +385,19 @@ tomlkit==0.11.0 # via pylint transaction==3.0.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # pyramid-tm # zope-sqlalchemy translationstring==1.4 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # pyramid typing-extensions==4.5.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # alembic # astroid # kombu @@ -407,72 +405,70 @@ typing-extensions==4.5.0 # sqlalchemy tzdata==2023.3 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # backports-zoneinfo # celery urllib3==1.26.17 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # requests # sentry-sdk venusian==3.0.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # pyramid vine==5.0.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # amqp # celery # kombu waitress==2.1.2 # via - # -r tests.txt + # -r requirements/tests.txt # webtest wcwidth==0.2.5 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # prompt-toolkit webob==1.8.6 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # pyramid # webtest webtest==3.0.0 - # via -r tests.txt + # via -r requirements/tests.txt wheel==0.38.1 # via - # -r tests.txt + # -r requirements/tests.txt # pip-tools wired==0.3 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # pyramid-services -wrapt==1.12.1 - # via astroid zipp==3.4.1 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # importlib-metadata # importlib-resources zope-deprecation==4.4.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # pyramid # pyramid-jinja2 zope-interface==5.2.0 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt # pyramid # pyramid-services # transaction @@ -480,5 +476,5 @@ zope-interface==5.2.0 # zope-sqlalchemy zope-sqlalchemy==3.1 # via - # -r requirements.txt - # -r tests.txt + # -r requirements/requirements.txt + # -r requirements/tests.txt From 1787bfc1ec9ccabfb6be36b97022629f5b40be39 Mon Sep 17 00:00:00 2001 From: Sean Hammond Date: Wed, 4 Oct 2023 16:27:11 +0100 Subject: [PATCH 2/2] Update pylint config for pylint 3.0 --- .pylintrc | 2 -- bin/update_dev_data.py | 1 + tests/.pylintrc | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.pylintrc b/.pylintrc index 163ae8f0..95d9c2aa 100644 --- a/.pylintrc +++ b/.pylintrc @@ -3,9 +3,7 @@ jobs=0 # Speed up PyLint by using one process per CPU core. load-plugins=pylint.extensions.bad_builtin, pylint.extensions.broad_try_clause, pylint.extensions.check_elif, - pylint.extensions.comparetozero, pylint.extensions.docparams, - pylint.extensions.emptystring, pylint.extensions.mccabe, pylint.extensions.overlapping_exceptions, pylint.extensions.redefined_variable_type, diff --git a/bin/update_dev_data.py b/bin/update_dev_data.py index 7e18980e..c4265f9e 100644 --- a/bin/update_dev_data.py +++ b/bin/update_dev_data.py @@ -43,6 +43,7 @@ def update_dev_data(): "example.net": Reason.MEDIA_VIDEO, "bad.example.com": Reason.MALICIOUS, } + # pylint:disable=used-before-assignment CustomRules(request.db).load_simple_rules(raw_rules) print(f"Loaded {len(raw_rules)} custom rules") diff --git a/tests/.pylintrc b/tests/.pylintrc index 16bb8d34..96361575 100644 --- a/tests/.pylintrc +++ b/tests/.pylintrc @@ -3,9 +3,7 @@ jobs=0 # Speed up PyLint by using one process per CPU core. load-plugins=pylint.extensions.bad_builtin, pylint.extensions.broad_try_clause, pylint.extensions.check_elif, - pylint.extensions.comparetozero, pylint.extensions.docparams, - pylint.extensions.emptystring, pylint.extensions.mccabe, pylint.extensions.overlapping_exceptions, pylint.extensions.redefined_variable_type,