cephadm: line break after binary operator (W504)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 7ac0479726b5d9ae925faff3c221f50e39547dd2)

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index e39138d8df3b46bf7ecb8547d79e68db0c248519..a76793ab90d647d3fbfe8504e82d6087d9eaba58 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -5224,9 +5224,9 @@ def command_rm_cluster(ctx):
          verbosity=CallVerbosity.DEBUG)
 
     # rm units
-    call_throws(ctx, ['rm', '-f', ctx.unit_dir +
+    call_throws(ctx, ['rm', '-f', ctx.unit_dir +  # noqa: W504
                       '/ceph-%s@.service' % ctx.fsid])
-    call_throws(ctx, ['rm', '-f', ctx.unit_dir +
+    call_throws(ctx, ['rm', '-f', ctx.unit_dir +  # noqa: W504
                       '/ceph-%s.target' % ctx.fsid])
     call_throws(ctx, ['rm', '-rf',
                       ctx.unit_dir + '/ceph-%s.target.wants' % ctx.fsid])
@@ -5234,7 +5234,7 @@ def command_rm_cluster(ctx):
     call_throws(ctx, ['rm', '-rf', ctx.data_dir + '/' + ctx.fsid])
     # rm logs
     call_throws(ctx, ['rm', '-rf', ctx.log_dir + '/' + ctx.fsid])
-    call_throws(ctx, ['rm', '-rf', ctx.log_dir +
+    call_throws(ctx, ['rm', '-rf', ctx.log_dir +  # noqa: W504
                       '/*.wants/ceph-%s@*' % ctx.fsid])
     # rm logrotate config
     call_throws(ctx, ['rm', '-f', ctx.logrotate_dir + '/ceph-%s' % ctx.fsid])
@@ -6409,9 +6409,8 @@ class HostFacts():
         """Return the attributes of this HostFacts object as json"""
         data = {
             k: getattr(self, k) for k in dir(self)
-            if not k.startswith('_') and
-            isinstance(getattr(self, k),
-                       (float, int, str, list, dict, tuple))
+            if not k.startswith('_')
+            and isinstance(getattr(self, k), (float, int, str, list, dict, tuple))
         }
         return json.dumps(data, indent=2, sort_keys=True)
 

diff --git a/src/cephadm/tox.ini b/src/cephadm/tox.ini
index 8650076998fb3f04151df11d35b5894c6dd45fee..754e4ccfd11173ae1256a5a59c41fbfac714ee6c 100644 (file)
--- a/src/cephadm/tox.ini
+++ b/src/cephadm/tox.ini
@@ -7,7 +7,6 @@ max-line-length = 100
 ignore =
     E501,
     W503,
-    W504,
 exclude =
     .tox,
     .vagrant,