mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'format' into 'master'

Browse source 
Make lint work with black

See merge request fdroid/fdroidserver!971
This commit is contained in:
Hans-Christoph Steiner 2021-06-24 12:29:02 +00:00
commit ab0fe06343
4 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.pylint-rcfile
View file

@ -43,3 +43,5 @@ good-names=i,j,k,ex,Run,f,fp
# Maximum number of nested blocks for function / method body # Maximum number of nested blocks for function / method body
max-nested-blocks=5 max-nested-blocks=5
[FORMAT]
max-line-length=88

9
.vscode/settings.json vendored
View file

@ -1,20 +1,19 @@
{ {
"python.formatting.blackArgs": [ "python.formatting.blackArgs": [
"--config pyproject.toml" "--config=pyproject.toml"
], ],
"python.formatting.provider": "black", "python.formatting.provider": "black",
"python.linting.banditEnabled": true, "python.linting.banditEnabled": true,
"python.linting.banditArgs": [ "python.linting.banditArgs": [
"-r",
"-ii", "-ii",
"--ini .bandit", "--ini=.bandit",
], ],
"python.linting.enabled": true, "python.linting.enabled": true,
"python.linting.mypyArgs": [ "python.linting.mypyArgs": [
"--config-file mypy.ini" "--config-file=mypy.ini"
], ],
"python.linting.mypyEnabled": true, "python.linting.mypyEnabled": true,
"python.linting.pycodestyleEnabled": true, "python.linting.flake8Enabled": true,
"python.linting.pylintArgs": [ "python.linting.pylintArgs": [
"--rcfile=.pylint-rcfile" "--rcfile=.pylint-rcfile"
], ],

5
hooks/pre-commit
View file

@ -55,13 +55,16 @@ fi
# We ignore the following PEP8 warnings # We ignore the following PEP8 warnings
# * E123: closing bracket does not match indentation of opening bracket's line # * E123: closing bracket does not match indentation of opening bracket's line
# - Broken if multiple indentation levels start on a single 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) # * E501: line too long (82 > 79 characters)
# - Recommended for readability but not enforced # - Recommended for readability but not enforced
# - Some lines are awkward to wrap around a char limit # - Some lines are awkward to wrap around a char limit
# * W503: line break before binary operator # * W503: line break before binary operator
# - Quite pedantic # - Quite pedantic
PEP8_IGNORE="E123,E501,W503"
PEP8_IGNORE="E123,E203,E501,W503"
err() { err() {
echo >&2 ERROR: "$@" echo >&2 ERROR: "$@"

8
setup.cfg
View file

@ -39,3 +39,11 @@ output_dir = locale
[compile_catalog] [compile_catalog]
domain = fdroidserver domain = fdroidserver
directory = locale directory = locale
[pycodestyle]
ignore = E203,W503
max-line-length = 88
[flake8]
ignore = E203,W503
max-line-length = 88