Fix pycodestyle complaints

Signed-off-by: Denys Fedoryshchenko <[email protected]>

Author: nuclearcat

kernelci/cli/job.py

@@ -55,7 +55,8 @@ def new(name, input_node_id, platform,  # pylint: disable=too-many-arguments
         if runtime not in configs['runtimes']:
             raise click.ClickException(f"Invalid runtime {runtime}")
         runtime = kernelci.runtime.get_runtime(
-            configs['runtimes'][runtime], token=secrets.api.runtime_token, custom_template_dir=config[0] if config else None)
+            configs['runtimes'][runtime], token=secrets.api.runtime_token,
+            custom_template_dir=config[0] if config else None)
     job_node = helper.create_job_node(job_config, input_node,
                                       platform=platform_config, runtime=runtime)
     if job_node:
@@ -107,16 +108,7 @@ def generate(node_id,  # pylint: disable=too-many-arguments, too-many-locals
         configs['storage'][storage]
         if storage else None
     )
-    if not runtime:
-        raise click.ClickException("No runtime provided (--runtime)")
-    runtimes_section = configs.get('runtimes', None)
-    if runtimes_section is None:
-        raise click.ClickException("No runtimes section found in the config")
-    runtime_config = runtimes_section.get(runtime, None)
-    if runtime_config is None:
-        raise click.ClickException(f"Runtime {runtime} not found in the config")
-    runtime = kernelci.runtime.get_runtime(
-        runtime_config, token=secrets.api.runtime_token, custom_template_dir=config[0] if config else None)
+    runtime = _get_runtime(runtime, config, secrets)
     params = runtime.get_params(job, api.config)
     if not params:
         raise click.ClickException("Invalid job parameters, aborting...")
@@ -136,6 +128,23 @@ def generate(node_id,  # pylint: disable=too-many-arguments, too-many-locals
         click.echo(job_data)
 
 
+def _get_runtime(runtime, config, secrets):
+    if not runtime:
+        raise click.ClickException("Runtime not specified, please provide --runtime argument")
+    configs = kernelci.config.load(config)
+    runtime_section = configs.get('runtimes', None)
+    if runtime_section is None:
+        raise click.ClickException("No runtime section found in the config")
+    runtime_config = runtime_section.get(runtime, None)
+    if runtime_config is None:
+        raise click.ClickException(f"Runtime {runtime} not found in the config")
+    runtime = kernelci.runtime.get_runtime(
+        runtime_config, token=secrets.api.runtime_token,
+        custom_template_dir=config[0] if config else None
+    )
+    return runtime
+
+
 @kci_job.command(secrets=True)
 @click.argument('job-path')
 @click.option('--wait', is_flag=True)
@@ -149,7 +158,8 @@ def submit(runtime, job_path, wait,  # pylint: disable=too-many-arguments
     configs = kernelci.config.load(config)
     runtime_config = configs['runtimes'][runtime]
     runtime = kernelci.runtime.get_runtime(
-        runtime_config, token=secrets.api.runtime_token, custom_template_dir=config[0] if config else None
+        runtime_config, token=secrets.api.runtime_token,
+        custom_template_dir=config[0] if config else None
     )
     job = runtime.submit(job_path)
     click.echo(runtime.get_job_id(job))

kernelci/runtime/__init__.py

@@ -88,7 +88,11 @@ def __init__(self, config, user=None, token=None, custom_template_dir=None):
             self._templates.append(custom_template_dir)
             # Add relevant subdirectories
             for subdir in ["runtime", "runtime/base", "runtime/boot", "runtime/tests"]:
-                sub_path = os.path.join(custom_template_dir, subdir) if not custom_template_dir.endswith(subdir) else custom_template_dir
+                sub_path = (
+                    os.path.join(custom_template_dir, subdir)
+                    if not custom_template_dir.endswith(subdir)
+                    else custom_template_dir
+                )
                 if os.path.isdir(sub_path):
                     self._templates.append(sub_path)
         self._user = user
@@ -231,7 +235,8 @@ def get_runtime(config, user=None, token=None, custom_template_dir=None):
     """
     module_name = '.'.join(['kernelci', 'runtime', config.lab_type])
     runtime_module = importlib.import_module(module_name)
-    return runtime_module.get_runtime(config, user=user, token=token, custom_template_dir=custom_template_dir)
+    return runtime_module.get_runtime(config, user=user, token=token,
+                                      custom_template_dir=custom_template_dir)
 
 
 def get_all_runtimes(runtime_configs, opts, custom_template_dir=None):
@@ -251,7 +256,8 @@ def get_all_runtimes(runtime_configs, opts, custom_template_dir=None):
             opts.get_from_section(section, opt)
             for opt in ('user', 'runtime_token')
         )
-        runtime = get_runtime(config, user=user, token=token, custom_template_dir=custom_template_dir)
+        runtime = get_runtime(config, user=user, token=token,
+                              custom_template_dir=custom_template_dir)
         yield config_name, runtime