From e8ad8a3645492c828133f82d8057cd3a02e74cbb Mon Sep 17 00:00:00 2001 From: Justin Chu Date: Mon, 16 Oct 2023 16:17:21 -0700 Subject: [PATCH 1/6] fix(linter): Use `--output-format` in the RUFF linter The `--format` option has been renamed to `--output-format` in https://github.com/astral-sh/ruff/pull/7984 --- lintrunner_adapters/adapters/ruff_linter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lintrunner_adapters/adapters/ruff_linter.py b/lintrunner_adapters/adapters/ruff_linter.py index 8d445a8..b58525d 100644 --- a/lintrunner_adapters/adapters/ruff_linter.py +++ b/lintrunner_adapters/adapters/ruff_linter.py @@ -23,7 +23,7 @@ def explain_rule(code: str) -> str: proc = run_command( - ["ruff", "rule", "--format=json", code], + ["ruff", "rule", "--output-format=json", code], check=True, ) rule = json.loads(str(proc.stdout, "utf-8").strip()) @@ -238,7 +238,7 @@ def check_file_for_fixes( def main() -> None: parser = argparse.ArgumentParser( - description=f"Ruff linter. Linter code: {LINTER_CODE}. Use with RUFF-FIX to auto-fix issues.", + description=f"Ruff linter with auto-fix support. Linter code: {LINTER_CODE}.", fromfile_prefix_chars="@", ) parser.add_argument( From cf8ff4b8598df7c4e55b0eb7bf11dcb389b6d1bd Mon Sep 17 00:00:00 2001 From: Justin Chu Date: Mon, 16 Oct 2023 16:18:11 -0700 Subject: [PATCH 2/6] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 49ed87c..a93d7d4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,7 @@ warn_unused_ignores = false [tool.poetry] name = "lintrunner-adapters" -version = "0.9.0" +version = "0.10.0" description = "Adapters and tools for lintrunner" authors = ["Justin Chu "] license = "MIT" From 027635d1fdb7264d16b1cf6d348892f85d629169 Mon Sep 17 00:00:00 2001 From: Justin Chu Date: Mon, 16 Oct 2023 16:39:32 -0700 Subject: [PATCH 3/6] Update ruff_linter.py --- lintrunner_adapters/adapters/ruff_linter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lintrunner_adapters/adapters/ruff_linter.py b/lintrunner_adapters/adapters/ruff_linter.py index b58525d..a04ae18 100644 --- a/lintrunner_adapters/adapters/ruff_linter.py +++ b/lintrunner_adapters/adapters/ruff_linter.py @@ -101,7 +101,7 @@ def check_files( "ruff", "--exit-zero", "--quiet", - "--format=json", + "--output-format=json", *([f"--config={config}"] if config else []), *filenames, ], From 6afc93a718dc4f243af2aa2e599a4a2fae4eb19c Mon Sep 17 00:00:00 2001 From: Justin Chu Date: Mon, 16 Oct 2023 16:41:03 -0700 Subject: [PATCH 4/6] Update ruff_linter.py --- lintrunner_adapters/adapters/ruff_linter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lintrunner_adapters/adapters/ruff_linter.py b/lintrunner_adapters/adapters/ruff_linter.py index a04ae18..adcde7f 100644 --- a/lintrunner_adapters/adapters/ruff_linter.py +++ b/lintrunner_adapters/adapters/ruff_linter.py @@ -23,7 +23,7 @@ def explain_rule(code: str) -> str: proc = run_command( - ["ruff", "rule", "--output-format=json", code], + ["ruff", "rule", "--format=json", code], check=True, ) rule = json.loads(str(proc.stdout, "utf-8").strip()) From 492a111e140ee7a39b1a884a4507abec710b0b12 Mon Sep 17 00:00:00 2001 From: Justin Chu Date: Mon, 16 Oct 2023 16:43:50 -0700 Subject: [PATCH 5/6] Update .lintrunner.toml --- .lintrunner.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.lintrunner.toml b/.lintrunner.toml index f899a9e..f6027da 100644 --- a/.lintrunner.toml +++ b/.lintrunner.toml @@ -344,7 +344,7 @@ init_command = [ 'run', 'pip_init', '--dry-run={{DRYRUN}}', - 'ruff==0.0.262', + 'ruff==0.0.291', ] is_formatter = true From 0a7819ff76939de96c06aa389c95b128e73d53c2 Mon Sep 17 00:00:00 2001 From: Justin Chu Date: Mon, 16 Oct 2023 16:50:23 -0700 Subject: [PATCH 6/6] Update rustfmt_linter.py --- lintrunner_adapters/adapters/rustfmt_linter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lintrunner_adapters/adapters/rustfmt_linter.py b/lintrunner_adapters/adapters/rustfmt_linter.py index a61db49..6de09fb 100644 --- a/lintrunner_adapters/adapters/rustfmt_linter.py +++ b/lintrunner_adapters/adapters/rustfmt_linter.py @@ -147,8 +147,8 @@ def check_file( replacement=None, description=( "Possible rustfmt bug. " - "rustfmt returned error output but didn't fail:\n{}" - ).format(clean_err), + f"rustfmt returned error output but didn't fail:\n{clean_err}" + ), ) ]