diff --git a/.lintrunner.toml b/.lintrunner.toml index f84440f..68224b2 100644 --- a/.lintrunner.toml +++ b/.lintrunner.toml @@ -166,7 +166,7 @@ init_command = [ 'run', 'pip_init', '--dry-run={{DRYRUN}}', - 'black==22.10.0', + 'black==23.12.1', # Use 24.x when ruff styles are updated 'isort==5.10.1', ] is_formatter = true @@ -346,7 +346,7 @@ init_command = [ 'run', 'pip_init', '--dry-run={{DRYRUN}}', - 'ruff==0.1.5', + 'ruff==0.2.1', ] is_formatter = true @@ -373,7 +373,7 @@ init_command = [ 'run', 'pip_init', '--dry-run={{DRYRUN}}', - 'ruff==0.1.5', + 'ruff==0.2.1', ] is_formatter = true diff --git a/examples/pytorch/black_isort_linter.py b/examples/pytorch/black_isort_linter.py index cca908d..7707e19 100644 --- a/examples/pytorch/black_isort_linter.py +++ b/examples/pytorch/black_isort_linter.py @@ -225,11 +225,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/examples/pytorch/black_linter.py b/examples/pytorch/black_linter.py index 3ed7fbd..0328883 100644 --- a/examples/pytorch/black_linter.py +++ b/examples/pytorch/black_linter.py @@ -200,11 +200,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/examples/pytorch/clangformat_linter.py b/examples/pytorch/clangformat_linter.py index 5a4a0b0..771ebdd 100644 --- a/examples/pytorch/clangformat_linter.py +++ b/examples/pytorch/clangformat_linter.py @@ -202,11 +202,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/examples/pytorch/clangtidy_linter.py b/examples/pytorch/clangtidy_linter.py index 7ff3d03..3a0d471 100644 --- a/examples/pytorch/clangtidy_linter.py +++ b/examples/pytorch/clangtidy_linter.py @@ -181,9 +181,12 @@ def check_file( name=match["code"], description=match["message"], line=int(match["line"]), - char=int(match["column"]) - if match["column"] is not None and not match["column"].startswith("-") - else None, + char=( + int(match["column"]) + if match["column"] is not None + and not match["column"].startswith("-") + else None + ), code="CLANGTIDY", severity=severities.get(match["severity"], LintSeverity.ERROR), original=None, @@ -228,11 +231,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/examples/pytorch/exec_linter.py b/examples/pytorch/exec_linter.py index 4a6f1e6..dcb6fec 100644 --- a/examples/pytorch/exec_linter.py +++ b/examples/pytorch/exec_linter.py @@ -68,11 +68,13 @@ def check_file(filename: str) -> Optional[LintMessage]: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/examples/pytorch/flake8_linter.py b/examples/pytorch/flake8_linter.py index 4973cdc..80a4c08 100644 --- a/examples/pytorch/flake8_linter.py +++ b/examples/pytorch/flake8_linter.py @@ -264,9 +264,11 @@ def check_files( try: proc = run_command( [sys.executable, "-mflake8", "--exit-zero"] + filenames, - extra_env={"FLAKE8_PLUGINS_PATH": flake8_plugins_path} - if flake8_plugins_path - else None, + extra_env=( + {"FLAKE8_PLUGINS_PATH": flake8_plugins_path} + if flake8_plugins_path + else None + ), retries=retries, ) except (OSError, subprocess.CalledProcessError) as err: @@ -307,9 +309,11 @@ def check_files( get_issue_documentation_url(match["code"]), ), line=int(match["line"]), - char=int(match["column"]) - if match["column"] is not None and not match["column"].startswith("-") - else None, + char=( + int(match["column"]) + if match["column"] is not None and not match["column"].startswith("-") + else None + ), code="FLAKE8", severity=severities.get(match["code"]) or get_issue_severity(match["code"]), original=None, @@ -353,11 +357,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/examples/pytorch/grep_linter.py b/examples/pytorch/grep_linter.py index 787ffda..af60da4 100644 --- a/examples/pytorch/grep_linter.py +++ b/examples/pytorch/grep_linter.py @@ -209,11 +209,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/examples/pytorch/isort_linter.py b/examples/pytorch/isort_linter.py index f4323ed..a0fa19d 100644 --- a/examples/pytorch/isort_linter.py +++ b/examples/pytorch/isort_linter.py @@ -200,11 +200,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/examples/pytorch/mypy_linter.py b/examples/pytorch/mypy_linter.py index 9d3778a..bc07989 100644 --- a/examples/pytorch/mypy_linter.py +++ b/examples/pytorch/mypy_linter.py @@ -116,9 +116,11 @@ def check_files( name=match["code"], description=match["message"], line=int(match["line"]), - char=int(match["column"]) - if match["column"] is not None and not match["column"].startswith("-") - else None, + char=( + int(match["column"]) + if match["column"] is not None and not match["column"].startswith("-") + else None + ), code="MYPY", severity=severities.get(match["severity"], LintSeverity.ERROR), original=None, @@ -158,11 +160,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/examples/pytorch/newlines_linter.py b/examples/pytorch/newlines_linter.py index 510a73a..93cfb4f 100644 --- a/examples/pytorch/newlines_linter.py +++ b/examples/pytorch/newlines_linter.py @@ -145,11 +145,13 @@ def check_file(filename: str) -> Optional[LintMessage]: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/examples/pytorch/s3_init.py b/examples/pytorch/s3_init.py index 86d9796..85b5fd8 100644 --- a/examples/pytorch/s3_init.py +++ b/examples/pytorch/s3_init.py @@ -189,9 +189,11 @@ def download( DRY_RUN = True logging.basicConfig( - format="[DRY_RUN] %(levelname)s: %(message)s" - if DRY_RUN - else "%(levelname)s: %(message)s", + format=( + "[DRY_RUN] %(levelname)s: %(message)s" + if DRY_RUN + else "%(levelname)s: %(message)s" + ), level=logging.INFO, stream=sys.stderr, ) diff --git a/examples/pytorch/ufmt_linter.py b/examples/pytorch/ufmt_linter.py index 5c9636d..f9a6a08 100644 --- a/examples/pytorch/ufmt_linter.py +++ b/examples/pytorch/ufmt_linter.py @@ -116,11 +116,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/__init__.py b/lintrunner_adapters/__init__.py index b33786e..76ab219 100644 --- a/lintrunner_adapters/__init__.py +++ b/lintrunner_adapters/__init__.py @@ -1,4 +1,5 @@ """Adapters and tools for lintrunner.""" + from __future__ import annotations __all__ = [ diff --git a/lintrunner_adapters/__main__.py b/lintrunner_adapters/__main__.py index 22396dc..243f9c4 100644 --- a/lintrunner_adapters/__main__.py +++ b/lintrunner_adapters/__main__.py @@ -10,6 +10,7 @@ to list available adapters. """ + from __future__ import annotations import json diff --git a/lintrunner_adapters/adapters/add_trailing_comma_linter.py b/lintrunner_adapters/adapters/add_trailing_comma_linter.py index 89e4a0b..580eecd 100644 --- a/lintrunner_adapters/adapters/add_trailing_comma_linter.py +++ b/lintrunner_adapters/adapters/add_trailing_comma_linter.py @@ -114,11 +114,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/black_isort_linter.py b/lintrunner_adapters/adapters/black_isort_linter.py index 5f1beb3..fbc1aae 100644 --- a/lintrunner_adapters/adapters/black_isort_linter.py +++ b/lintrunner_adapters/adapters/black_isort_linter.py @@ -8,6 +8,7 @@ import concurrent.futures import logging import os +import pathlib import subprocess import sys @@ -39,6 +40,10 @@ def check_file( ) import_sorted = proc.stdout # Pipe isort's result to black + + # Resolve the file path to get around errors with Python 3.8/3.9 on Windows + # https://github.com/psf/black/issues/4209 + resolved_filename = str(pathlib.Path(filename).resolve()) proc = run_command( [ sys.executable, @@ -47,7 +52,7 @@ def check_file( *(("--ipynb",) if filename.endswith(".ipynb") else ()), *(("--fast",) if fast else ()), "--stdin-filename", - filename, + resolved_filename, "-", ], stdin=None, @@ -143,11 +148,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/black_linter.py b/lintrunner_adapters/adapters/black_linter.py index fb26df6..e36eab4 100644 --- a/lintrunner_adapters/adapters/black_linter.py +++ b/lintrunner_adapters/adapters/black_linter.py @@ -6,6 +6,7 @@ import concurrent.futures import logging import os +import pathlib import subprocess import sys @@ -26,6 +27,9 @@ def check_file( with open(filename, "rb") as f: original = f.read() with open(filename, "rb") as f: + # Resolve the file path to get around errors with Python 3.8/3.9 on Windows + # https://github.com/psf/black/issues/4209 + resolved_filename = str(pathlib.Path(filename).resolve()) proc = run_command( [ sys.executable, @@ -34,7 +38,7 @@ def check_file( *(("--ipynb",) if filename.endswith(".ipynb") else ()), *(("--fast",) if fast else ()), "--stdin-filename", - filename, + resolved_filename, "-", ], stdin=f, @@ -129,11 +133,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/clangformat_linter.py b/lintrunner_adapters/adapters/clangformat_linter.py index b9465f1..55d25dd 100644 --- a/lintrunner_adapters/adapters/clangformat_linter.py +++ b/lintrunner_adapters/adapters/clangformat_linter.py @@ -136,11 +136,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/clippy_linter.py b/lintrunner_adapters/adapters/clippy_linter.py index a4c723f..ddaeb95 100644 --- a/lintrunner_adapters/adapters/clippy_linter.py +++ b/lintrunner_adapters/adapters/clippy_linter.py @@ -219,11 +219,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/django_upgrade_linter.py b/lintrunner_adapters/adapters/django_upgrade_linter.py index 2422065..9636cac 100644 --- a/lintrunner_adapters/adapters/django_upgrade_linter.py +++ b/lintrunner_adapters/adapters/django_upgrade_linter.py @@ -121,11 +121,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/editorconfig_checker_linter.py b/lintrunner_adapters/adapters/editorconfig_checker_linter.py index 1863201..30b0008 100644 --- a/lintrunner_adapters/adapters/editorconfig_checker_linter.py +++ b/lintrunner_adapters/adapters/editorconfig_checker_linter.py @@ -99,11 +99,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/exec_linter.py b/lintrunner_adapters/adapters/exec_linter.py index f124795..2f196e0 100644 --- a/lintrunner_adapters/adapters/exec_linter.py +++ b/lintrunner_adapters/adapters/exec_linter.py @@ -50,11 +50,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/flake8_linter.py b/lintrunner_adapters/adapters/flake8_linter.py index 68bb892..9e1de6d 100644 --- a/lintrunner_adapters/adapters/flake8_linter.py +++ b/lintrunner_adapters/adapters/flake8_linter.py @@ -252,9 +252,11 @@ def check_files( show_disable, ), line=int(match["line"]), - char=int(match["column"]) - if match["column"] is not None and not match["column"].startswith("-") - else None, + char=( + int(match["column"]) + if match["column"] is not None and not match["column"].startswith("-") + else None + ), code=LINTER_CODE, severity=severities.get(match["code"]) or get_issue_severity(match["code"]), original=None, @@ -303,11 +305,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/grep_linter.py b/lintrunner_adapters/adapters/grep_linter.py index 5f752cf..f1493f4 100644 --- a/lintrunner_adapters/adapters/grep_linter.py +++ b/lintrunner_adapters/adapters/grep_linter.py @@ -163,11 +163,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/isort_linter.py b/lintrunner_adapters/adapters/isort_linter.py index 5542c6b..cad0a57 100644 --- a/lintrunner_adapters/adapters/isort_linter.py +++ b/lintrunner_adapters/adapters/isort_linter.py @@ -113,11 +113,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/mypy_linter.py b/lintrunner_adapters/adapters/mypy_linter.py index 928dc60..cd116f1 100644 --- a/lintrunner_adapters/adapters/mypy_linter.py +++ b/lintrunner_adapters/adapters/mypy_linter.py @@ -101,9 +101,11 @@ def check_files( description=match["message"] + (disable_message(match["code"]) if show_disable else ""), line=int(match["line"]), - char=int(match["column"]) - if match["column"] is not None and not match["column"].startswith("-") - else None, + char=( + int(match["column"]) + if match["column"] is not None and not match["column"].startswith("-") + else None + ), code=LINTER_CODE, severity=SEVERITIES.get(match["severity"], LintSeverity.ERROR), original=None, @@ -138,11 +140,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/newlines_linter.py b/lintrunner_adapters/adapters/newlines_linter.py index ee32997..7808017 100644 --- a/lintrunner_adapters/adapters/newlines_linter.py +++ b/lintrunner_adapters/adapters/newlines_linter.py @@ -133,11 +133,13 @@ def check_file(filename: str) -> LintMessage | None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/pylint_linter.py b/lintrunner_adapters/adapters/pylint_linter.py index fa62941..d716dbb 100644 --- a/lintrunner_adapters/adapters/pylint_linter.py +++ b/lintrunner_adapters/adapters/pylint_linter.py @@ -159,9 +159,11 @@ def check_files( match["message"], match["code"], match["string_code"], show_disable ), line=int(match["line"]), - char=int(match["column"]) - if match["column"] is not None and not match["column"].startswith("-") - else None, + char=( + int(match["column"]) + if match["column"] is not None and not match["column"].startswith("-") + else None + ), code=LINTER_CODE, severity=SEVERITIES.get(match["code"][0], LintSeverity.ERROR), original=None, @@ -198,11 +200,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/pyupgrade_linter.py b/lintrunner_adapters/adapters/pyupgrade_linter.py index 539be22..d942934 100644 --- a/lintrunner_adapters/adapters/pyupgrade_linter.py +++ b/lintrunner_adapters/adapters/pyupgrade_linter.py @@ -131,11 +131,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/refurb_linter.py b/lintrunner_adapters/adapters/refurb_linter.py index 5a66f1f..dfb8a23 100644 --- a/lintrunner_adapters/adapters/refurb_linter.py +++ b/lintrunner_adapters/adapters/refurb_linter.py @@ -98,9 +98,11 @@ def check_files( show_disable, ), line=int(match["line"]), - char=int(match["column"]) - if match["column"] is not None and not match["column"].startswith("-") - else None, + char=( + int(match["column"]) + if match["column"] is not None and not match["column"].startswith("-") + else None + ), code=LINTER_CODE, severity=severities.get(match["code"], LintSeverity.ADVICE), original=None, @@ -137,11 +139,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/requirements_txt_linter.py b/lintrunner_adapters/adapters/requirements_txt_linter.py index 0791034..ce81630 100644 --- a/lintrunner_adapters/adapters/requirements_txt_linter.py +++ b/lintrunner_adapters/adapters/requirements_txt_linter.py @@ -171,11 +171,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/ruff_fix_linter.py b/lintrunner_adapters/adapters/ruff_fix_linter.py index ee4445b..4f0ef0f 100644 --- a/lintrunner_adapters/adapters/ruff_fix_linter.py +++ b/lintrunner_adapters/adapters/ruff_fix_linter.py @@ -113,11 +113,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/ruff_format_linter.py b/lintrunner_adapters/adapters/ruff_format_linter.py index 2c4723f..1498b8f 100644 --- a/lintrunner_adapters/adapters/ruff_format_linter.py +++ b/lintrunner_adapters/adapters/ruff_format_linter.py @@ -112,11 +112,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/ruff_linter.py b/lintrunner_adapters/adapters/ruff_linter.py index 38c091b..2c7ec50 100644 --- a/lintrunner_adapters/adapters/ruff_linter.py +++ b/lintrunner_adapters/adapters/ruff_linter.py @@ -282,11 +282,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/rustfmt_linter.py b/lintrunner_adapters/adapters/rustfmt_linter.py index 6de09fb..ec72d95 100644 --- a/lintrunner_adapters/adapters/rustfmt_linter.py +++ b/lintrunner_adapters/adapters/rustfmt_linter.py @@ -190,11 +190,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/toml_sort_linter.py b/lintrunner_adapters/adapters/toml_sort_linter.py index d536b10..b9f43b3 100644 --- a/lintrunner_adapters/adapters/toml_sort_linter.py +++ b/lintrunner_adapters/adapters/toml_sort_linter.py @@ -109,11 +109,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/adapters/ufmt_linter.py b/lintrunner_adapters/adapters/ufmt_linter.py index 10f5f08..f0716ee 100644 --- a/lintrunner_adapters/adapters/ufmt_linter.py +++ b/lintrunner_adapters/adapters/ufmt_linter.py @@ -90,11 +90,13 @@ def main() -> None: logging.basicConfig( format="<%(threadName)s:%(levelname)s> %(message)s", - level=logging.NOTSET - if args.verbose - else logging.DEBUG - if len(args.filenames) < 1000 - else logging.INFO, + level=( + logging.NOTSET + if args.verbose + else logging.DEBUG + if len(args.filenames) < 1000 + else logging.INFO + ), stream=sys.stderr, ) diff --git a/lintrunner_adapters/tools/convert_to_sarif.py b/lintrunner_adapters/tools/convert_to_sarif.py index 822a844..f2d1f96 100644 --- a/lintrunner_adapters/tools/convert_to_sarif.py +++ b/lintrunner_adapters/tools/convert_to_sarif.py @@ -19,7 +19,7 @@ def severity_to_github_level(severity: str) -> str: def parse_single_lintrunner_result( - lintrunner_result: dict[str, Any] + lintrunner_result: dict[str, Any], ) -> tuple[dict[str, Any], dict[str, Any]]: r"""Parse a single lintrunner result.