diff options
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/build/.ruff.toml | 12 | ||||
| -rw-r--r-- | Tools/build/check_warnings.py | 31 |
2 files changed, 20 insertions, 23 deletions
diff --git a/Tools/build/.ruff.toml b/Tools/build/.ruff.toml index c084c06144a..fa7689d45db 100644 --- a/Tools/build/.ruff.toml +++ b/Tools/build/.ruff.toml @@ -1,5 +1,13 @@ extend = "../../.ruff.toml" # Inherit the project-wide settings +[per-file-target-version] +"deepfreeze.py" = "py310" +"stable_abi.py" = "py311" # requires 'tomllib' + +[format] +preview = true +docstring-code-format = true + [lint] select = [ "C4", # flake8-comprehensions @@ -24,10 +32,6 @@ ignore = [ "UP038", # Use `X | Y` in `isinstance` call instead of `(X, Y)` ] -[per-file-target-version] -"deepfreeze.py" = "py310" -"stable_abi.py" = "py311" # requires 'tomllib' - [lint.per-file-ignores] "{check_extension_modules,freeze_modules}.py" = [ "UP031", # Use format specifiers instead of percent format diff --git a/Tools/build/check_warnings.py b/Tools/build/check_warnings.py index 7a8721087b6..3f49d8e7f2e 100644 --- a/Tools/build/check_warnings.py +++ b/Tools/build/check_warnings.py @@ -83,17 +83,13 @@ def extract_warnings_from_compiler_output( for i, line in enumerate(compiler_output.splitlines(), start=1): if match := compiled_regex.match(line): try: - compiler_warnings.append( - { - "file": match.group("file").removeprefix(path_prefix), - "line": match.group("line"), - "column": match.group("column"), - "message": match.group("message"), - "option": match.group("option") - .lstrip("[") - .rstrip("]"), - } - ) + compiler_warnings.append({ + "file": match.group("file").removeprefix(path_prefix), + "line": match.group("line"), + "column": match.group("column"), + "message": match.group("message"), + "option": match.group("option").lstrip("[").rstrip("]"), + }) except AttributeError: print( f"Error parsing compiler output. " @@ -151,7 +147,6 @@ def get_unexpected_warnings( """ unexpected_warnings = {} for file in files_with_warnings.keys(): - rule = is_file_ignored(file, ignore_rules) if rule: @@ -201,13 +196,11 @@ def get_unexpected_improvements( if rule.file_path not in files_with_warnings.keys(): unexpected_improvements.append((rule.file_path, rule.count, 0)) elif len(files_with_warnings[rule.file_path]) < rule.count: - unexpected_improvements.append( - ( - rule.file_path, - rule.count, - len(files_with_warnings[rule.file_path]), - ) - ) + unexpected_improvements.append(( + rule.file_path, + rule.count, + len(files_with_warnings[rule.file_path]), + )) if unexpected_improvements: print("Unexpected improvements:") |