mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-07-24 05:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use ast::PythonVersion internally in the formatter and linter (#16170)

Browse source 
## Summary

This PR updates the formatter and linter to use the `PythonVersion`
struct from the `ruff_python_ast` crate internally. While this doesn't
remove the need for the `linter::PythonVersion` enum, it does remove the
`formatter::PythonVersion` enum and limits the use in the linter to
deserializing from CLI arguments and config files and moves most of the
remaining methods to the `ast::PythonVersion` struct.

## Test Plan

Existing tests, with some inputs and outputs updated to reflect the new
(de)serialization format. I think these are test-specific and shouldn't
affect any external (de)serialization.

---------

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
This commit is contained in:
Brent Westbrook 2025-02-18 12:03:13 -05:00 • committed by GitHub
parent 0868e73d2c
commit a9efdea113
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
153 changed files with 456 additions and 539 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/backslash_before_indent.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py310"}
{"target_version": "3.10"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/context_managers_38.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py38"}
{"target_version": "3.8"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/context_managers_autodetect_310.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py310"}
{"target_version": "3.10"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/context_managers_autodetect_311.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py311"}
{"target_version": "3.11"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/context_managers_autodetect_38.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py38"}
{"target_version": "3.8"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/funcdef_return_type_trailing_comma.options.json vendored
View file

@ -1 +1 @@
{"preview": "enabled", "target_version": "py310"}
{"preview": "enabled", "target_version": "3.10"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/keep_newline_after_match.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py310"}
{"target_version": "3.10"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/parenthesized_context_managers.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py310"}
{"target_version": "3.10"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/pattern_matching_complex.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py310"}
{"target_version": "3.10"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/pattern_matching_extras.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py310"}
{"target_version": "3.10"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/pattern_matching_generic.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py310"}
{"target_version": "3.10"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/pattern_matching_long.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py310"}
{"target_version": "3.10"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/pattern_matching_simple.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py310"}
{"target_version": "3.10"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/pattern_matching_style.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py310"}
{"target_version": "3.10"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/pattern_matching_trailing_comma.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py310"}
{"target_version": "3.10"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/pattern_matching_with_if_stmt.options.json vendored
View file

@ -1 +1 @@
{"preview": "enabled", "target_version": "py310"}
{"preview": "enabled", "target_version": "3.10"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep604_union_types_line_breaks.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py310"}
{"target_version": "3.10"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_572_py310.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py310"}
{"target_version": "3.10"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_646.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py311"}
{"target_version": "3.11"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_654.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py311"}
{"target_version": "3.11"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_654_style.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py311"}
{"target_version": "3.11"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_701.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py312"}
{"target_version": "3.12"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_pep646_typed_star_arg_type_var_tuple.options.json vendored
View file

@ -1 +1 @@
{"preview": "enabled", "target_version": "py311"}
{"preview": "enabled", "target_version": "3.11"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/py310_pep572.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py310"}
{"target_version": "3.10"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_redundant_parens_in_case_guard.options.json vendored
View file

@ -1 +1 @@
{"preview": "enabled", "line_width": 79, "target_version": "py310"}
{"preview": "enabled", "line_width": 79, "target_version": "3.10"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/starred_for_target.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py310"}
{"target_version": "3.10"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_aliases.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py312"}
{"target_version": "3.12"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_param_defaults.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py313"}
{"target_version": "3.13"}

2
crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_params.options.json vendored
View file

@ -1 +1 @@
{"target_version": "py312"}
{"target_version": "3.12"}

3
crates/ruff_python_formatter/resources/test/fixtures/import_black_tests.py vendored
View file

@ -58,8 +58,7 @@ def import_fixture(fixture: Path, fixture_set: str):
if "--minimum-version=" in flags:
[_, version] = flags.split("--minimum-version=", 1)
version = version.split(" ", 1)[0]
# Convert 3.10 to py310
black_options["target_version"] = f"py{version.strip().replace('.', '')}"
black_options["target_version"] = version.strip()
if "--skip-magic-trailing-comma" in flags:
black_options["magic_trailing_comma"] = "ignore"

2
crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/join_implicit_concatenated_string_preserve.options.json vendored
View file

@ -4,6 +4,6 @@
},
{
"quote_style": "preserve",
"target_version": "py312"
"target_version": "3.12"
}
]

4
crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/with.options.json vendored
View file

@ -1,9 +1,9 @@
[
{
"target_version": "py38"
"target_version": "3.8"
},
{
"target_version": "py39",
"target_version": "3.9",
"preview": "enabled"
}
]

2
crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/with_39.options.json vendored
View file

@ -1,6 +1,6 @@
[
{
"target_version": "py39",
"target_version": "3.9",
"preview": "enabled"
}
]