From 4290df076346ffba6f915cb3b6da66e34249b637 Mon Sep 17 00:00:00 2001 From: shatakshiiii Date: Mon, 24 Apr 2023 15:25:09 +0530 Subject: [PATCH 1/3] Remove G from ruff ignores --- pyproject.toml | 1 - src/ansiblelint/logger.py | 2 +- src/ansiblelint/skip_utils.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1877b71489..bf65faddf2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -225,7 +225,6 @@ ignore = [ "SIM", "BLE", "D", - "G", "RET", "N", "EM", diff --git a/src/ansiblelint/logger.py b/src/ansiblelint/logger.py index e03cd8974b..7a8d992106 100644 --- a/src/ansiblelint/logger.py +++ b/src/ansiblelint/logger.py @@ -16,7 +16,7 @@ def timed_info(msg: Any, *args: Any) -> Iterator[None]: yield finally: elapsed = time.time() - start - _logger.info(msg + " (%.2fs)", *(*args, elapsed)) + _logger.info("%s (%.2fs)", msg, *(*args, elapsed)) def warn_or_fail(message: str) -> None: diff --git a/src/ansiblelint/skip_utils.py b/src/ansiblelint/skip_utils.py index 00c630d70b..53a42c913e 100644 --- a/src/ansiblelint/skip_utils.py +++ b/src/ansiblelint/skip_utils.py @@ -97,7 +97,7 @@ def append_skipped_rules( yaml_skip = _append_skipped_rules(pyyaml_data, lintable) except RuntimeError: # Notify user of skip error, do not stop, do not change exit code - _logger.error("Error trying to append skipped rules", exc_info=True) + _logger.exception("Error trying to append skipped rules") return pyyaml_data if not yaml_skip: From a7240c7f29f5434be25fa2fb10229d279b470965 Mon Sep 17 00:00:00 2001 From: shatakshiiii Date: Mon, 24 Apr 2023 20:39:20 +0530 Subject: [PATCH 2/3] fix tests --- src/ansiblelint/logger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ansiblelint/logger.py b/src/ansiblelint/logger.py index 7a8d992106..f23bb8feee 100644 --- a/src/ansiblelint/logger.py +++ b/src/ansiblelint/logger.py @@ -16,7 +16,7 @@ def timed_info(msg: Any, *args: Any) -> Iterator[None]: yield finally: elapsed = time.time() - start - _logger.info("%s (%.2fs)", msg, *(*args, elapsed)) + _logger.info(msg, " (%.2fs)", *(*args, elapsed)) def warn_or_fail(message: str) -> None: From 5680bdb6dfd29b4b3605501d9f36efb483a8e3a3 Mon Sep 17 00:00:00 2001 From: shatakshiiii Date: Tue, 25 Apr 2023 17:27:12 +0530 Subject: [PATCH 3/3] use noqa as other string formatting options are also not supported --- src/ansiblelint/logger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ansiblelint/logger.py b/src/ansiblelint/logger.py index f23bb8feee..f0477cd59c 100644 --- a/src/ansiblelint/logger.py +++ b/src/ansiblelint/logger.py @@ -16,7 +16,7 @@ def timed_info(msg: Any, *args: Any) -> Iterator[None]: yield finally: elapsed = time.time() - start - _logger.info(msg, " (%.2fs)", *(*args, elapsed)) + _logger.info(msg + " (%.2fs)", *(*args, elapsed)) # noqa: G003 def warn_or_fail(message: str) -> None: