diff --git a/.pylintrc b/.pylintrc index 9f8188f8..6527b7e1 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, @@ -21,6 +19,8 @@ enable= deprecated-pragma, useless-suppression, use-symbolic-message-instead, + use-implicit-booleaness-not-comparison-to-zero, + use-implicit-booleaness-not-comparison-to-string, disable=missing-type-doc, missing-return-doc, diff --git a/requirements/lint.in b/requirements/lint.in index caff6101..102c5831 100644 --- a/requirements/lint.in +++ b/requirements/lint.in @@ -1,6 +1,6 @@ pip-tools pip-sync-faster -pylint<2.18 +pylint<3.1 pydocstyle -r tests.txt -r requirements.txt diff --git a/requirements/lint.txt b/requirements/lint.txt index d2b91ad3..27623e59 100644 --- a/requirements/lint.txt +++ b/requirements/lint.txt @@ -4,7 +4,7 @@ # # pip-compile --allow-unsafe requirements/lint.in # -astroid==2.15.8 +astroid==3.0.0 # via pylint attrs==20.3.0 # via @@ -134,8 +134,6 @@ jsonschema==3.2.0 # -r requirements/requirements.txt # -r requirements/tests.txt # checkmatelib -lazy-object-proxy==1.6.0 - # via astroid markupsafe==1.1.1 # via # -r requirements/requirements.txt @@ -200,7 +198,7 @@ pycparser==2.20 # cffi pydocstyle==6.3.0 # via -r requirements/lint.in -pylint==2.17.7 +pylint==3.0.0 # via -r requirements/lint.in pyopenssl==22.1.0 # via @@ -364,8 +362,6 @@ whitenoise==6.5.0 # via # -r requirements/requirements.txt # -r requirements/tests.txt -wrapt==1.12.1 - # via astroid wsgiprox==1.5.2 # via # -r requirements/requirements.txt diff --git a/tests/.pylintrc b/tests/.pylintrc index 648ff14d..2fd61481 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, @@ -16,6 +14,8 @@ load-plugins=pylint.extensions.bad_builtin, fail-on=C,E,F,I,R,W [MESSAGES CONTROL] +enable=use-implicit-booleaness-not-comparison-to-zero, + use-implicit-booleaness-not-comparison-to-string, disable=invalid-name, missing-function-docstring, missing-module-docstring, diff --git a/tox.ini b/tox.ini index 09cb5a89..d0306635 100644 --- a/tox.ini +++ b/tox.ini @@ -10,8 +10,9 @@ filterwarnings = ; pkg_resources is calling its own deprecated function? Anyway I don't think the problem is with us. ignore:^Deprecated call to .pkg_resources\.declare_namespace\('.*'\).\.:DeprecationWarning:pkg_resources ; pkg_resources used in some of our dependencies - ignore:^pkg_resources is deprecated as an API$:DeprecationWarning:pkg_resources - + ignore:^pkg_resources is deprecated as an API:DeprecationWarning:pkg_resources + ignore:^pkg_resources is deprecated as an API:DeprecationWarning:gevent + ignore:^pkg_resources is deprecated as an API:DeprecationWarning:pywb xfail_strict=true