Commit ab0fe063 authored by Hans-Christoph Steiner's avatar Hans-Christoph Steiner
Browse files

Merge branch 'format' into 'master'

Make lint work with black

See merge request !971
parents 958fd172 33137a85
Pipeline #326588423 failed with stages
in 60 minutes and 2 seconds
......@@ -43,3 +43,5 @@ good-names=i,j,k,ex,Run,f,fp
# Maximum number of nested blocks for function / method body
max-nested-blocks=5
[FORMAT]
max-line-length=88
{
"python.formatting.blackArgs": [
"--config pyproject.toml"
"--config=pyproject.toml"
],
"python.formatting.provider": "black",
"python.linting.banditEnabled": true,
"python.linting.banditArgs": [
"-r",
"-ii",
"--ini .bandit",
"--ini=.bandit",
],
"python.linting.enabled": true,
"python.linting.mypyArgs": [
"--config-file mypy.ini"
"--config-file=mypy.ini"
],
"python.linting.mypyEnabled": true,
"python.linting.pycodestyleEnabled": true,
"python.linting.flake8Enabled": true,
"python.linting.pylintArgs": [
"--rcfile=.pylint-rcfile"
],
......
......@@ -55,13 +55,16 @@ fi
# We ignore the following PEP8 warnings
# * E123: closing bracket does not match indentation of opening bracket's line
# - Broken if multiple indentation levels start on a single line
# * E203: whitespace before ':'
# - E203 is not PEP 8 compliant and conflict with black
# * E501: line too long (82 > 79 characters)
# - Recommended for readability but not enforced
# - Some lines are awkward to wrap around a char limit
# * W503: line break before binary operator
# - Quite pedantic
PEP8_IGNORE="E123,E501,W503"
PEP8_IGNORE="E123,E203,E501,W503"
err() {
echo >&2 ERROR: "$@"
......
......@@ -39,3 +39,11 @@ output_dir = locale
[compile_catalog]
domain = fdroidserver
directory = locale
[pycodestyle]
ignore = E203,W503
max-line-length = 88
[flake8]
ignore = E203,W503
max-line-length = 88
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment