Merge pull request #656 from DanielRuf/codestyle/ignore-e605-fix-cond…

…ition codestyle: ignore W605 and change multiline condition to one line
arachnys · May 12, 2020 · 0e5478b · 0e5478b
2 parents 56cfed4 + 052d863
commit 0e5478b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/cabot/cabotapp/tasks.py b/cabot/cabotapp/tasks.py
@@ -100,9 +100,7 @@ def clean_db(days_to_retain=7, batch_size=10000):
 
     # If we reached the batch size on either we need to re-queue to continue cleaning up.
     if (
-            result_count == batch_size or
-            service_snapshot_count == batch_size or
-            instance_snapshot_count == batch_size
+            result_count == batch_size or service_snapshot_count == batch_size or instance_snapshot_count == batch_size
     ):
         clean_db.apply_async(kwargs={
             'days_to_retain': days_to_retain,

diff --git a/tox.ini b/tox.ini
@@ -47,7 +47,7 @@ commands =
 
 [flake8]
 exclude = .venv,venv,.tox,dist,doc,build,*.egg,docs,setup.py,*/migrations/
-ignore = E121,E123,E125,E126,E127,E128,E131,E222,E226,E231,E251,E261,E265,E302,E305,E402,E714,E722,F401,F403,F405,F841,W391
+ignore = E121,E123,E125,E126,E127,E128,E131,E222,E226,E231,E251,E261,E265,E302,E305,E402,E714,E722,F401,F403,F405,F841,W391,W605
 max-line-length = 160
 # E121 continuation line under-indented for hanging indent
 # E123 closing bracket does not match indentation of opening bracket's line
@@ -72,3 +72,4 @@ max-line-length = 160
 # F405 foo may be undefined, or defined from star imports
 # F841 local variable 'foo' is assigned to but never used
 # W391 blank line at end of file
+# W605 invalid escape sequence