Merge lp:~barryprice/juju-deployer/resolve-pep8-failures into lp:juju-deployer

[Barry Price]

Fix PEP8/Flake8 errors

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Benjamin Allot (ballot)]

LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 221

=== modified file 'deployer/action/diff.py'
--- deployer/action/diff.py	2016-12-16 11:17:35 +0000
+++ deployer/action/diff.py	2020-10-16 07:31:11 +0000
@@ -143,8 +143,9 @@
             mod['cfg-constraints'] = dep_constraints
 
         # Now collect all the options from both services and diff them.
-        all_options = (set(dep_service.get('options', {}).keys()) |
-                       set(env_service.get('options', {}).keys()))
+        all_options = (
+            set(dep_service.get('options', {}).keys()) | set(env_service.get('options', {}).keys())
+        )
         for key in all_options:
             dep_value = dep_service.get('options', {}).get(key)
             # Assume the charm default if the deployment specifies no value.

=== modified file 'deployer/config.py'
--- deployer/config.py	2016-07-12 02:29:52 +0000
+++ deployer/config.py	2020-10-16 07:31:11 +0000
@@ -59,8 +59,7 @@
 
         # Check if this is a v4 bundle.
         services = yaml_result.get('services')
-        if (isinstance(services, dict) and
-                'services' not in services):
+        if (isinstance(services, dict) and 'services' not in services):
             self.version = 4
             yaml_result = {config_file: yaml_result}
 

=== modified file 'deployer/deployment.py'
--- deployer/deployment.py	2020-10-07 02:09:02 +0000
+++ deployer/deployment.py	2020-10-16 07:31:11 +0000
@@ -256,8 +256,7 @@
     def _resolve_include(self, svc_name, k, v):
         feedback = Feedback()
         for include_type in ["file", "base64"]:
-            if (not isinstance(v, six.string_types) or
-                    not v.startswith("include-%s://" % include_type)):
+            if (not isinstance(v, six.string_types) or not v.startswith("include-%s://" % include_type)):
                 continue
             include, fname = v.split("://", 1)
             ip = resolve_include(fname, self.include_dirs)

=== modified file 'deployer/env/base.py'
--- deployer/env/base.py	2020-02-26 12:08:57 +0000
+++ deployer/env/base.py	2020-10-16 07:31:11 +0000
@@ -145,9 +145,9 @@
         units have finished executing stop hooks and are removed).
 
         """
-        if (self.juju_version == 1 and
-            ((isinstance(mid, int) and mid == 0) or
-             (mid.isdigit() and int(mid) == 0))):
+        if (
+            self.juju_version == 1 and ((isinstance(mid, int) and mid == 0) or (mid.isdigit() and int(mid) == 0))
+        ):
             # Don't kill state server
             raise RuntimeError("Can't terminate machine 0")
         if get_juju_major_version() == 1:

=== modified file 'deployer/env/go.py'
--- deployer/env/go.py	2017-08-30 09:01:00 +0000
+++ deployer/env/go.py	2020-10-16 07:31:11 +0000
@@ -283,10 +283,7 @@
         d = NormalizedDelta(d)
         name = d.get('Name', d.get('Id', 'unknown'))
         state = (
-            d.get('workload-status') or
-            d.get('Status') or
-            d.get('Life') or
-            'unknown'
+            d.get('workload-status') or d.get('Status') or d.get('Life') or 'unknown'
         )
         if et == "relation":
             name = self._format_endpoints(d['Endpoints'])

=== modified file 'deployer/relation.py'
--- deployer/relation.py	2016-12-20 15:10:01 +0000
+++ deployer/relation.py	2020-10-16 07:31:11 +0000
@@ -17,10 +17,7 @@
         # equal only by service if name is "*" or unset
         return (
             (self.ep == ep.ep) or (
-                (not self.name or self.name == "*" or
-                    not ep.name or ep.name == "*") and
-                self.service == ep.service
-            )
+                (not self.name or self.name == "*" or not ep.name or ep.name == "*") and self.service == ep.service)
         )
 
 
@@ -35,8 +32,7 @@
     def __eq__(self, ep_pair):
         if not isinstance(ep_pair, EndpointPair):
             return False
-        return (ep_pair.ep_x in self and
-                ep_pair.ep_y in self)
+        return (ep_pair.ep_x in self and ep_pair.ep_y in self)
 
     def __contains__(self, ep):
         return (self.ep_x == ep or self.ep_y == ep)

=== modified file 'deployer/service.py'
--- deployer/service.py	2017-03-16 04:23:06 +0000
+++ deployer/service.py	2020-10-16 07:31:11 +0000
@@ -128,8 +128,7 @@
         unit_names = list(svc_units.keys())
         unit_names.sort(key=lambda unit: int(unit.split('/')[1]))
         machine = (
-            svc_units[unit_names[int(u_idx)]].get('Machine') or
-            svc_units[unit_names[int(u_idx)]].get('machine')
+            svc_units[unit_names[int(u_idx)]].get('Machine') or svc_units[unit_names[int(u_idx)]].get('machine')
         )
         if not machine:
             self.deployment.log.warning(
@@ -273,9 +272,9 @@
             return
 
         self.service.svc_data['to'] = (
-            unit_mapping +
-            list(itertools.repeat(
-                unit_mapping[-1], unit_count - len(unit_mapping)))
+            unit_mapping + list(itertools.repeat(
+                unit_mapping[-1], unit_count - len(unit_mapping))
+            )
         )
         unit_mapping = self.service.unit_placement
 

=== modified file 'deployer/tests/test_diff.py'
--- deployer/tests/test_diff.py	2020-10-16 07:31:11 +0000
+++ deployer/tests/test_diff.py	2020-10-16 07:31:11 +0000
@@ -191,8 +191,9 @@
         env = MemoryEnvironment(dpl.name, dpl)
         diff = Diff(env, edited_dpl, {}).do_diff()
         # verify ceilometer<->keystone present in unknown relations
-        self.assertTrue('ceilometer' in str(diff['relations']['unknown']) and
-                        'keystone' in str(diff['relations']['unknown']))
+        self.assertTrue(
+            'ceilometer' in str(diff['relations']['unknown']) and 'keystone' in str(diff['relations']['unknown'])
+        )
 
     def test_diff_cfg_replace_with_unnamed_relations(self):
         dpl = self.get_deployment()

=== modified file 'deployer/utils.py'
--- deployer/utils.py	2017-03-16 04:23:06 +0000
+++ deployer/utils.py	2020-10-16 07:31:11 +0000
@@ -245,12 +245,10 @@
 def _get_juju_home():
     if get_juju_major_version() == 1:
         return (
-            os.environ.get("JUJU_HOME") or
-            path_join(os.environ.get('HOME'), '.juju')
+            os.environ.get("JUJU_HOME") or path_join(os.environ.get('HOME'), '.juju')
         )
     return (
-        os.environ.get("JUJU_DATA") or
-        path_join(os.environ.get('HOME'), '.local', 'share', 'juju')
+        os.environ.get("JUJU_DATA") or path_join(os.environ.get('HOME'), '.local', 'share', 'juju')
     )
 
 
@@ -325,8 +323,7 @@
     for (key, value) in source.items():
         if key == 'relations' and key in target:
             target[key] = relations_combine(target[key], value)
-        elif (key in target and isinstance(target[key], dict) and
-                isinstance(value, dict)):
+        elif (key in target and isinstance(target[key], dict) and isinstance(value, dict)):
             target[key] = dict_merge(target[key], value)
         else:
             target[key] = value