summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2018-12-09 11:45:32 -0500
committerJason R. Coombs <jaraco@jaraco.com>2018-12-09 11:48:44 -0500
commit308ded414c076b4334ee2ed23d2e596f4279f0f5 (patch)
tree81a7d729b29f6cd4680fbbd403b116e4d542a5fe
parent65305d812b5a2db0535d3272bb62399b19377f48 (diff)
downloadcherrypy-git-308ded414c076b4334ee2ed23d2e596f4279f0f5.tar.gz
Ignore inherently-contradictory flake8 rules
-rw-r--r--.flake86
-rw-r--r--.pre-commit-config.yaml3
2 files changed, 6 insertions, 3 deletions
diff --git a/.flake8 b/.flake8
new file mode 100644
index 00000000..469fed68
--- /dev/null
+++ b/.flake8
@@ -0,0 +1,6 @@
+[flake8]
+ignore =
+ # W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
+ W503
+ # W504 has issues https://github.com/OCA/maintainer-quality-tools/issues/545
+ W504
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8a627512..a492c3b3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,9 +5,6 @@ repos:
- id: trailing-whitespace
exclude: cherrypy/test/static/index.html
- id: flake8
- args:
- # W503 ignored for https://github.com/PyCQA/pycodestyle/issues/498
- - --ignore=W503
- id: check-merge-conflict
- id: double-quote-string-fixer
- id: end-of-file-fixer