From 1c314365124752b88775e9a88bf4e5a99c5d0efe Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 19 Jul 2023 09:29:35 -0400 Subject: [PATCH] [pre-commit.ci] pre-commit autoupdate (#290) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/asottile/add-trailing-comma: v2.5.1 → v3.0.0](https://github.com/asottile/add-trailing-comma/compare/v2.5.1...v3.0.0) - [github.com/pre-commit/mirrors-prettier: v3.0.0-alpha.9-for-vscode → v3.0.0](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.0-alpha.9-for-vscode...v3.0.0) - [github.com/psf/black: 23.3.0 → 23.7.0](https://github.com/psf/black/compare/23.3.0...23.7.0) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 6 +++--- plugins/action/cli_parse.py | 6 +++--- plugins/action/fact_diff.py | 2 +- plugins/action/validate.py | 2 +- plugins/filter/param_list_compare.py | 5 ++++- plugins/filter/validate.py | 5 ++++- plugins/lookup/validate.py | 2 +- plugins/plugin_utils/base/validate.py | 6 ++++-- plugins/test/validate.py | 5 ++++- tests/unit/plugins/action/test_cli_parse.py | 15 ++++++++++++--- 10 files changed, 37 insertions(+), 17 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d200c18..ddbe6f2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,12 +16,12 @@ repos: - id: trailing-whitespace - repo: https://github.com/asottile/add-trailing-comma - rev: v2.5.1 + rev: v3.0.0 hooks: - id: add-trailing-comma - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v3.0.0-alpha.9-for-vscode" + rev: "v3.0.0" hooks: - id: prettier additional_dependencies: @@ -36,6 +36,6 @@ repos: args: ["--filter-files"] - repo: https://github.com/psf/black - rev: 23.3.0 + rev: 23.7.0 hooks: - id: black diff --git a/plugins/action/cli_parse.py b/plugins/action/cli_parse.py index d806db5..f9314a6 100644 --- a/plugins/action/cli_parse.py +++ b/plugins/action/cli_parse.py @@ -113,7 +113,7 @@ class ActionModule(ActionBase): self._display.warning(msg) parserlib = "ansible_collections.{corg}.{cname}.plugins.sub_plugins.cli_parser.{plugin}_parser".format( - **cref + **cref, ) try: parsercls = getattr(import_module(parserlib), self.PARSER_CLS_NAME) @@ -135,7 +135,7 @@ class ActionModule(ActionBase): ]: parserlib = ( "ansible_collections.{corg}.{cname}.plugins.cli_parsers.{plugin}_parser".format( - **cref + **cref, ) ) try: @@ -281,7 +281,7 @@ class ActionModule(ActionBase): DOCUMENTATION, "cli_parse module", schema_conditionals=ARGSPEC_CONDITIONALS, - **self._task.args + **self._task.args, ) if not valid: return argspec_result diff --git a/plugins/action/fact_diff.py b/plugins/action/fact_diff.py index 4842a50..85674d3 100644 --- a/plugins/action/fact_diff.py +++ b/plugins/action/fact_diff.py @@ -75,7 +75,7 @@ class ActionModule(ActionBase): cref.update(directory=directory) parserlib = ( "ansible_collections.{corg}.{cname}.plugins.sub_plugins.{directory}.{plugin}".format( - **cref + **cref, ) ) try: diff --git a/plugins/action/validate.py b/plugins/action/validate.py index e113992..a2eb306 100644 --- a/plugins/action/validate.py +++ b/plugins/action/validate.py @@ -58,7 +58,7 @@ class ActionModule(ActionBase): DOCUMENTATION, "validate module", schema_conditionals=ARGSPEC_CONDITIONALS, - **self._task.args + **self._task.args, ) if not valid: return argspec_result diff --git a/plugins/filter/param_list_compare.py b/plugins/filter/param_list_compare.py index 683da33..731b9f6 100644 --- a/plugins/filter/param_list_compare.py +++ b/plugins/filter/param_list_compare.py @@ -176,7 +176,10 @@ def param_list_compare(*args, **kwargs): ) valid, argspec_result, updated_params = check_argspec( - DOCUMENTATION, "param_list_compare filter", schema_conditionals=ARGSPEC_CONDITIONALS, **data + DOCUMENTATION, + "param_list_compare filter", + schema_conditionals=ARGSPEC_CONDITIONALS, + **data, ) if not valid: raise AnsibleFilterError( diff --git a/plugins/filter/validate.py b/plugins/filter/validate.py index badb9e4..85e9eb7 100644 --- a/plugins/filter/validate.py +++ b/plugins/filter/validate.py @@ -94,7 +94,10 @@ def validate(*args, **kwargs): params.update({"engine": kwargs["engine"]}) valid, argspec_result, updated_params = check_argspec( - DOCUMENTATION, "validate filter", schema_conditionals=ARGSPEC_CONDITIONALS, **params + DOCUMENTATION, + "validate filter", + schema_conditionals=ARGSPEC_CONDITIONALS, + **params, ) if not valid: raise AnsibleFilterError( diff --git a/plugins/lookup/validate.py b/plugins/lookup/validate.py index b7492d1..5567f15 100644 --- a/plugins/lookup/validate.py +++ b/plugins/lookup/validate.py @@ -112,7 +112,7 @@ class LookupModule(LookupBase): schema=schema[0], name="validate lookup", schema_conditionals=ARGSPEC_CONDITIONALS, - **params + **params, ) if not valid: raise AnsibleLookupError( diff --git a/plugins/plugin_utils/base/validate.py b/plugins/plugin_utils/base/validate.py index 1dff866..9e88280 100644 --- a/plugins/plugin_utils/base/validate.py +++ b/plugins/plugin_utils/base/validate.py @@ -49,7 +49,7 @@ class ValidateBase(object): cref = dict(zip(["corg", "cname", "plugin"], engine.split("."))) validatorlib = ( "ansible_collections.{corg}.{cname}.plugins.sub_plugins.validate.{plugin}".format( - **cref + **cref, ) ) @@ -123,7 +123,9 @@ class ValidateBase(object): break valid, argspec_result, updated_params = check_argspec( - yaml.dump(argspec_obj), self._engine, **params + yaml.dump(argspec_obj), + self._engine, + **params, ) if not valid: raise AnsibleError( diff --git a/plugins/test/validate.py b/plugins/test/validate.py index 6318b81..9873af8 100644 --- a/plugins/test/validate.py +++ b/plugins/test/validate.py @@ -100,7 +100,10 @@ def validate(*args, **kwargs): params.update({item: kwargs[item]}) valid, argspec_result, updated_params = check_argspec( - DOCUMENTATION, "validate test", schema_conditionals=ARGSPEC_CONDITIONALS, **params + DOCUMENTATION, + "validate test", + schema_conditionals=ARGSPEC_CONDITIONALS, + **params, ) if not valid: raise AnsibleError( diff --git a/tests/unit/plugins/action/test_cli_parse.py b/tests/unit/plugins/action/test_cli_parse.py index 5e350fc..c0c8af7 100644 --- a/tests/unit/plugins/action/test_cli_parse.py +++ b/tests/unit/plugins/action/test_cli_parse.py @@ -81,7 +81,10 @@ class TestCli_Parse(unittest.TestCase): }, } valid, result, updated_params = check_argspec( - DOCUMENTATION, "cli_parse module", schema_conditionals={}, **kwargs + DOCUMENTATION, + "cli_parse module", + schema_conditionals={}, + **kwargs, ) self.assertEqual(valid, True) @@ -94,7 +97,10 @@ class TestCli_Parse(unittest.TestCase): }, } valid, result, updated_params = check_argspec( - DOCUMENTATION, "cli_parse module", schema_conditionals=ARGSPEC_CONDITIONALS, **kwargs + DOCUMENTATION, + "cli_parse module", + schema_conditionals=ARGSPEC_CONDITIONALS, + **kwargs, ) self.assertIn("one of the following is required: command, text", result["errors"]) @@ -103,7 +109,10 @@ class TestCli_Parse(unittest.TestCase): """Confirm failed argspec no parser name""" kwargs = {"text": "anything", "parser": {"command": "show version"}} valid, result, updated_params = check_argspec( - DOCUMENTATION, "cli_parse module", schema_conditionals=ARGSPEC_CONDITIONALS, **kwargs + DOCUMENTATION, + "cli_parse module", + schema_conditionals=ARGSPEC_CONDITIONALS, + **kwargs, ) self.assertIn( "missing required arguments: name found in parser",