diff --git a/fdroidserver/common.py b/fdroidserver/common.py index e0f279da..41a76605 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1056,7 +1056,7 @@ class vcs: """Get a list of all the known tags, sorted from newest to oldest.""" raise VCSException('latesttags not supported for this vcs type') - def getref(self): + def getref(self, revname=None): """Get current commit reference (hash, revision, etc).""" raise VCSException('getref not supported for this vcs type') diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py index 1baa1551..9b7ab967 100644 --- a/fdroidserver/lint.py +++ b/fdroidserver/lint.py @@ -248,8 +248,8 @@ def get_lastbuild(builds): return lastbuild -def check_update_check_data_url(app): - """Updatecheckdata must have a valid HTTPS URL to protect checkupdates runs.""" +def check_update_check_data_url(app): # noqa: D403 + """UpdateCheckData must have a valid HTTPS URL to protect checkupdates runs.""" if app.UpdateCheckData and app.UpdateCheckMode == 'HTTP': urlcode, codeex, urlver, verex = app.UpdateCheckData.split('|') for url in (urlcode, urlver): diff --git a/setup.cfg b/setup.cfg index d8b88bc2..3414de70 100644 --- a/setup.cfg +++ b/setup.cfg @@ -40,6 +40,10 @@ output_dir = locale domain = fdroidserver directory = locale +[pycodestyle] +ignore = E203,W503 +max-line-length = 88 + [flake8] ignore = E203,W503 max-line-length = 88 @@ -51,5 +55,4 @@ max-line-length = 88 # * rest are the conventions which are ignored by numpy conventions according to http://www.pydocstyle.org/en/stable/error_codes.html [pydocstyle] #convention = numpy # cannot be used in combination with ignore, so we list rules seperately. -ignore = D100,D101,D102,D103,D104,D105,D106,D107,D203,D212,D213,D402,D413,D415,D416,D417,E203,W503 -max-line-length = 88 +ignore = D100,D101,D102,D103,D104,D105,D106,D107,D203,D212,D213,D402,D413,D415,D416,D417