Commit 3ff96e39 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge branch 'develop' into release

parents a2353b53 6b31bf56

.lint

+0 −32
Original line number Diff line number Diff line
@@ -93,37 +93,5 @@ include = 
  ; B950 is a replacement for E501

  B0 B903 B950



[pylint.MASTER]

persistent=yes

ignore =

  __pycache__

  .*



[pylint.BASIC]

const-rgx = (([A-Z_][A-Z0-9_]*)|(_[A-Za-z0-9_]+))$

good-names = db, i, a, b, ab, t, fd



[pylint.REPORTS]

reports = no



[pylint.FORMAT]

indent-string = '\t'



[pylint.DESIGN]

max-attributes = 10



[pylint.MESSAGES CONTROL]

disable =

  bad-continuation,

  ; Would be nice to not disable but it is bugged; it trys to interpret tabs as

  ; spaces.



  trailing-whitespace,

  ; Would be nice to have enabled for *code* but not for comments or

  ; multi-line strings.



  wrong-import-order,

  ; Rely on isort, otherwise pylint and isort occasionally clash.





; vim:ft=cfg:sw=2:sts=2:expandtab

.pre-commit-config.yaml

+4 −9
Original line number Diff line number Diff line
@@ -75,19 +75,14 @@ repos: 
    - flake8-sfs

    - flake8-tabs



- repo: https://code.kodo.org.uk/dom/pre-commit-pylint

  rev: v2.6.0

  hooks:

  - id: pylint

    args: ["--fail-under=9.0", "--rcfile=.lint"]



- repo: local

  hooks:

  - id: mypy

    name: Mypy

    name: mypy

    types: [python]

    language: system

    language: python

    entry: ./pre_commit_mypy.py

    args: ["--config-file=.lint"]

    additional_dependencies: [mypy, click]

    require_serial: true

    verbose: true
 
    stages: [commit]

.pre-commit-hooks.yaml

+2 −2
Original line number Diff line number Diff line 
- id: mypy

  name: Mypy

  name: mypy

  types: [python]

  language: python

  entry: pre-commit-mypy

  require_serial: true

  verbose: true
 
  stages: [commit]

pre_commit_mypy.py

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ def main(extras, editable, mypy_arguments): 
		sys.stderr.write(exc.stderr)

		sys.exit(3)



	mypy(None, stdout=sys.stdout, stderr=sys.stderr, args=mypy_arguments)

	mypy(None, stdout=sys.stdout, stderr=sys.stderr, args=list(mypy_arguments))





if __name__ == '__main__':