Merge "trivial: fix yapf/pep8 interaction failing on logical operator"

2019-03-25 16:21:50 +00:00 · 2019-03-25 16:21:50 +00:00 · e3e5683765
commit e3e5683765
parent bc0e420bc4 ca614beac7
2 changed files with 6 additions and 1 deletions
--- a/.style.yapf
+++ b/.style.yapf
@ -0,0 +1,5 @@
+[style]
+based_on_style = pep8
+spaces_before_comment = 2
+column_limit = 79
+split_before_logical_operator = false
--- a/tox.ini
+++ b/tox.ini
@ -24,7 +24,7 @@ basepython = python3
 deps =
    -r{toxinidir}/test-requirements.txt
 commands =
-    yapf --style=pep8 -ir {toxinidir}/pegleg {toxinidir}/tests
+    yapf -ir {toxinidir}/pegleg {toxinidir}/tests

 [testenv:pep8]
 basepython = python3