Update format for yapf 0.27

This is the result of `tox -e format` having applied yapf changes from version 0.26 to 0.27. Signed-off-by: Sean Myers <[email protected]>
ansible · Apr 9, 2019 · 8633c34 · 8633c34
1 parent bcbec24
commit 8633c34
Show file tree

Hide file tree

Showing 82 changed files with 947 additions and 978 deletions.
diff --git a/molecule/command/base.py b/molecule/command/base.py
@@ -89,8 +89,8 @@ def execute_cmdline_scenarios(scenario_name, args, command_args):
     :returns: None
 
     """
-    scenarios = molecule.scenarios.Scenarios(
-        get_configs(args, command_args), scenario_name)
+    scenarios = molecule.scenarios.Scenarios(get_configs(args, command_args),
+                                             scenario_name)
     scenarios.print_matrix()
     for scenario in scenarios:
         try:

diff --git a/molecule/command/check.py b/molecule/command/check.py
@@ -73,12 +73,11 @@ def execute(self):
 
 @click.command()
 @click.pass_context
-@click.option(
-    '--scenario-name',
-    '-s',
-    default=base.MOLECULE_DEFAULT_SCENARIO_NAME,
-    help='Name of the scenario to target. ({})'.format(
-        base.MOLECULE_DEFAULT_SCENARIO_NAME))
+@click.option('--scenario-name',
+              '-s',
+              default=base.MOLECULE_DEFAULT_SCENARIO_NAME,
+              help='Name of the scenario to target. ({})'.format(
+                  base.MOLECULE_DEFAULT_SCENARIO_NAME))
 def check(ctx, scenario_name):  # pragma: no cover
     """
     Use the provisioner to perform a Dry-Run (destroy, dependency, create,

diff --git a/molecule/command/cleanup.py b/molecule/command/cleanup.py
@@ -82,12 +82,11 @@ def execute(self):
 
 @click.command(name='cleanup')
 @click.pass_context
-@click.option(
-    '--scenario-name',
-    '-s',
-    default=base.MOLECULE_DEFAULT_SCENARIO_NAME,
-    help='Name of the scenario to target. ({})'.format(
-        base.MOLECULE_DEFAULT_SCENARIO_NAME))
+@click.option('--scenario-name',
+              '-s',
+              default=base.MOLECULE_DEFAULT_SCENARIO_NAME,
+              help='Name of the scenario to target. ({})'.format(
+                  base.MOLECULE_DEFAULT_SCENARIO_NAME))
 def cleanup(ctx, scenario_name):  # pragma: no cover
     """
     Use the provisioner to cleanup any changes made to external systems during

diff --git a/molecule/command/converge.py b/molecule/command/converge.py
@@ -83,12 +83,11 @@ def execute(self):
 
 @click.command()
 @click.pass_context
-@click.option(
-    '--scenario-name',
-    '-s',
-    default=base.MOLECULE_DEFAULT_SCENARIO_NAME,
-    help='Name of the scenario to target. ({})'.format(
-        base.MOLECULE_DEFAULT_SCENARIO_NAME))
+@click.option('--scenario-name',
+              '-s',
+              default=base.MOLECULE_DEFAULT_SCENARIO_NAME,
+              help='Name of the scenario to target. ({})'.format(
+                  base.MOLECULE_DEFAULT_SCENARIO_NAME))
 @click.argument('ansible_args', nargs=-1, type=click.UNPROCESSED)
 def converge(ctx, scenario_name, ansible_args):  # pragma: no cover
     """

diff --git a/molecule/command/create.py b/molecule/command/create.py
@@ -94,17 +94,15 @@ def execute(self):
 
 @click.command()
 @click.pass_context
-@click.option(
-    '--scenario-name',
-    '-s',
-    default=base.MOLECULE_DEFAULT_SCENARIO_NAME,
-    help='Name of the scenario to target. ({})'.format(
-        base.MOLECULE_DEFAULT_SCENARIO_NAME))
-@click.option(
-    '--driver-name',
-    '-d',
-    type=click.Choice(config.molecule_drivers()),
-    help='Name of driver to use. (docker)')
+@click.option('--scenario-name',
+              '-s',
+              default=base.MOLECULE_DEFAULT_SCENARIO_NAME,
+              help='Name of the scenario to target. ({})'.format(
+                  base.MOLECULE_DEFAULT_SCENARIO_NAME))
+@click.option('--driver-name',
+              '-d',
+              type=click.Choice(config.molecule_drivers()),
+              help='Name of driver to use. (docker)')
 def create(ctx, scenario_name, driver_name):  # pragma: no cover
     """ Use the provisioner to start the instances. """
     args = ctx.obj.get('args')

diff --git a/molecule/command/dependency.py b/molecule/command/dependency.py
@@ -73,12 +73,11 @@ def execute(self):
 
 @click.command()
 @click.pass_context
-@click.option(
-    '--scenario-name',
-    '-s',
-    default=base.MOLECULE_DEFAULT_SCENARIO_NAME,
-    help='Name of the scenario to target. ({})'.format(
-        base.MOLECULE_DEFAULT_SCENARIO_NAME))
+@click.option('--scenario-name',
+              '-s',
+              default=base.MOLECULE_DEFAULT_SCENARIO_NAME,
+              help='Name of the scenario to target. ({})'.format(
+                  base.MOLECULE_DEFAULT_SCENARIO_NAME))
 def dependency(ctx, scenario_name):  # pragma: no cover
     """ Manage the role's dependencies. """
     args = ctx.obj.get('args')

diff --git a/molecule/command/destroy.py b/molecule/command/destroy.py
@@ -98,22 +98,19 @@ def execute(self):
 
 @click.command()
 @click.pass_context
-@click.option(
-    '--scenario-name',
-    '-s',
-    default=base.MOLECULE_DEFAULT_SCENARIO_NAME,
-    help='Name of the scenario to target. ({})'.format(
-        base.MOLECULE_DEFAULT_SCENARIO_NAME))
-@click.option(
-    '--driver-name',
-    '-d',
-    type=click.Choice(config.molecule_drivers()),
-    help='Name of driver to use. (docker)')
-@click.option(
-    '--all/--no-all',
-    '__all',
-    default=False,
-    help='Destroy all scenarios. Default is False.')
+@click.option('--scenario-name',
+              '-s',
+              default=base.MOLECULE_DEFAULT_SCENARIO_NAME,
+              help='Name of the scenario to target. ({})'.format(
+                  base.MOLECULE_DEFAULT_SCENARIO_NAME))
+@click.option('--driver-name',
+              '-d',
+              type=click.Choice(config.molecule_drivers()),
+              help='Name of driver to use. (docker)')
+@click.option('--all/--no-all',
+              '__all',
+              default=False,
+              help='Destroy all scenarios. Default is False.')
 def destroy(ctx, scenario_name, driver_name, __all):  # pragma: no cover
     """ Use the provisioner to destroy the instances. """
     args = ctx.obj.get('args')

diff --git a/molecule/command/idempotence.py b/molecule/command/idempotence.py
@@ -139,12 +139,11 @@ def _non_idempotent_tasks(self, output):
 
 @click.command()
 @click.pass_context
-@click.option(
-    '--scenario-name',
-    '-s',
-    default=base.MOLECULE_DEFAULT_SCENARIO_NAME,
-    help='Name of the scenario to target. ({})'.format(
-        base.MOLECULE_DEFAULT_SCENARIO_NAME))
+@click.option('--scenario-name',
+              '-s',
+              default=base.MOLECULE_DEFAULT_SCENARIO_NAME,
+              help='Name of the scenario to target. ({})'.format(
+                  base.MOLECULE_DEFAULT_SCENARIO_NAME))
 def idempotence(ctx, scenario_name):  # pragma: no cover
     """
     Use the provisioner to configure the instances and parse the output to

diff --git a/molecule/command/init/base.py b/molecule/command/init/base.py
@@ -63,8 +63,8 @@ def _process_templates(self,
 
     def _resolve_template_dir(self, template_dir):
         if not os.path.isabs(template_dir):
-            template_dir = os.path.join(
-                os.path.dirname(__file__), os.path.pardir, os.path.pardir,
-                'cookiecutter', template_dir)
+            template_dir = os.path.join(os.path.dirname(__file__),
+                                        os.path.pardir, os.path.pardir,
+                                        'cookiecutter', template_dir)
 
         return template_dir
diff --git a/molecule/command/init/role.py b/molecule/command/init/role.py
@@ -79,34 +79,31 @@ def execute(self):
 
 @click.command()
 @click.pass_context
-@click.option(
-    '--dependency-name',
-    type=click.Choice(['galaxy']),
-    default='galaxy',
-    help='Name of dependency to initialize. (galaxy)')
-@click.option(
-    '--driver-name',
-    '-d',
-    type=click.Choice(config.molecule_drivers()),
-    default='docker',
-    help='Name of driver to initialize. (docker)')
-@click.option(
-    '--lint-name',
-    type=click.Choice(['yamllint']),
-    default='yamllint',
-    help='Name of lint to initialize. (yamllint)')
-@click.option(
-    '--provisioner-name',
-    type=click.Choice(['ansible']),
-    default='ansible',
-    help='Name of provisioner to initialize. (ansible)')
-@click.option(
-    '--role-name', '-r', required=True, help='Name of the role to create.')
-@click.option(
-    '--verifier-name',
-    type=click.Choice(config.molecule_verifiers()),
-    default='testinfra',
-    help='Name of verifier to initialize. (testinfra)')
+@click.option('--dependency-name',
+              type=click.Choice(['galaxy']),
+              default='galaxy',
+              help='Name of dependency to initialize. (galaxy)')
+@click.option('--driver-name',
+              '-d',
+              type=click.Choice(config.molecule_drivers()),
+              default='docker',
+              help='Name of driver to initialize. (docker)')
+@click.option('--lint-name',
+              type=click.Choice(['yamllint']),
+              default='yamllint',
+              help='Name of lint to initialize. (yamllint)')
+@click.option('--provisioner-name',
+              type=click.Choice(['ansible']),
+              default='ansible',
+              help='Name of provisioner to initialize. (ansible)')
+@click.option('--role-name',
+              '-r',
+              required=True,
+              help='Name of the role to create.')
+@click.option('--verifier-name',
+              type=click.Choice(config.molecule_verifiers()),
+              default='testinfra',
+              help='Name of verifier to initialize. (testinfra)')
 def role(ctx, dependency_name, driver_name, lint_name, provisioner_name,
          role_name, verifier_name):  # pragma: no cover
     """ Initialize a new role for use with Molecule. """

diff --git a/molecule/command/init/scenario.py b/molecule/command/init/scenario.py
@@ -118,46 +118,39 @@ def _default_scenario_exists(ctx, param, value):  # pragma: no cover
 
 @click.command()
 @click.pass_context
-@click.option(
-    '--dependency-name',
-    type=click.Choice(['galaxy']),
-    default='galaxy',
-    help='Name of dependency to initialize. (galaxy)')
-@click.option(
-    '--driver-name',
-    '-d',
-    type=click.Choice(config.molecule_drivers()),
-    default='docker',
-    help='Name of driver to initialize. (docker)')
-@click.option(
-    '--lint-name',
-    type=click.Choice(['yamllint']),
-    default='yamllint',
-    help='Name of lint to initialize. (ansible-lint)')
-@click.option(
-    '--provisioner-name',
-    type=click.Choice(['ansible']),
-    default='ansible',
-    help='Name of provisioner to initialize. (ansible)')
-@click.option(
-    '--role-name',
-    '-r',
-    required=False,
-    callback=_role_exists,
-    help='Name of the role to create.')
-@click.option(
-    '--scenario-name',
-    '-s',
-    default=command_base.MOLECULE_DEFAULT_SCENARIO_NAME,
-    required=True,
-    callback=_default_scenario_exists,
-    help='Name of the scenario to create. ({})'.format(
-        command_base.MOLECULE_DEFAULT_SCENARIO_NAME))
-@click.option(
-    '--verifier-name',
-    type=click.Choice(config.molecule_verifiers()),
-    default='testinfra',
-    help='Name of verifier to initialize. (testinfra)')
+@click.option('--dependency-name',
+              type=click.Choice(['galaxy']),
+              default='galaxy',
+              help='Name of dependency to initialize. (galaxy)')
+@click.option('--driver-name',
+              '-d',
+              type=click.Choice(config.molecule_drivers()),
+              default='docker',
+              help='Name of driver to initialize. (docker)')
+@click.option('--lint-name',
+              type=click.Choice(['yamllint']),
+              default='yamllint',
+              help='Name of lint to initialize. (ansible-lint)')
+@click.option('--provisioner-name',
+              type=click.Choice(['ansible']),
+              default='ansible',
+              help='Name of provisioner to initialize. (ansible)')
+@click.option('--role-name',
+              '-r',
+              required=False,
+              callback=_role_exists,
+              help='Name of the role to create.')
+@click.option('--scenario-name',
+              '-s',
+              default=command_base.MOLECULE_DEFAULT_SCENARIO_NAME,
+              required=True,
+              callback=_default_scenario_exists,
+              help='Name of the scenario to create. ({})'.format(
+                  command_base.MOLECULE_DEFAULT_SCENARIO_NAME))
+@click.option('--verifier-name',
+              type=click.Choice(config.molecule_verifiers()),
+              default='testinfra',
+              help='Name of verifier to initialize. (testinfra)')
 def scenario(ctx, dependency_name, driver_name, lint_name, provisioner_name,
              role_name, scenario_name, verifier_name):  # pragma: no cover
     """ Initialize a new scenario for use with Molecule. """

diff --git a/molecule/command/init/template.py b/molecule/command/init/template.py
@@ -76,20 +76,18 @@ def execute(self):
 
 @click.command()
 @click.pass_context
-@click.option(
-    '--url',
-    required=True,
-    help='URL to the Cookiecutter templates repository.')
+@click.option('--url',
+              required=True,
+              help='URL to the Cookiecutter templates repository.')
 @click.option(
     '--no-input/--input',
     default=False,
     help=('Do not prompt for parameters and only use cookiecutter.json for '
           'content. (false)'))
-@click.option(
-    '--role-name',
-    '-r',
-    default='role_name',
-    help='Name of the role to create.')
+@click.option('--role-name',
+              '-r',
+              default='role_name',
+              help='Name of the role to create.')
 def template(ctx, url, no_input, role_name):  # pragma: no cover
     """ Initialize a new role from a Cookiecutter URL. """
     command_args = {

diff --git a/molecule/command/lint.py b/molecule/command/lint.py
@@ -82,12 +82,11 @@ def execute(self):
 
 @click.command()
 @click.pass_context
-@click.option(
-    '--scenario-name',
-    '-s',
-    default=base.MOLECULE_DEFAULT_SCENARIO_NAME,
-    help='Name of the scenario to target. ({})'.format(
-        base.MOLECULE_DEFAULT_SCENARIO_NAME))
+@click.option('--scenario-name',
+              '-s',
+              default=base.MOLECULE_DEFAULT_SCENARIO_NAME,
+              help='Name of the scenario to target. ({})'.format(
+                  base.MOLECULE_DEFAULT_SCENARIO_NAME))
 def lint(ctx, scenario_name):  # pragma: no cover
     """ Lint the role. """
     args = ctx.obj.get('args')

diff --git a/molecule/command/list.py b/molecule/command/list.py
@@ -91,12 +91,11 @@ def execute(self):
 @click.command()
 @click.pass_context
 @click.option('--scenario-name', '-s', help='Name of the scenario to target.')
-@click.option(
-    '--format',
-    '-f',
-    type=click.Choice(['simple', 'plain', 'yaml']),
-    default='simple',
-    help='Change output format. (simple)')
+@click.option('--format',
+              '-f',
+              type=click.Choice(['simple', 'plain', 'yaml']),
+              default='simple',
+              help='Change output format. (simple)')
 def list(ctx, scenario_name, format):  # pragma: no cover
     """ Lists status of instances. """
     args = ctx.obj.get('args')
@@ -107,8 +106,8 @@ def list(ctx, scenario_name, format):  # pragma: no cover
     }
 
     statuses = []
-    s = scenarios.Scenarios(
-        base.get_configs(args, command_args), scenario_name)
+    s = scenarios.Scenarios(base.get_configs(args, command_args),
+                            scenario_name)
     for scenario in s:
         statuses.extend(base.execute_subcommand(scenario.config, subcommand))