Set target versions in Black tests (#9221)

crates/ruff_python_formatter/resources/test/fixtures/black/cases/comment_type_hint.py

@@ -0,0 +1,2 @@
+# split out from comments2 as it does not work with line-length=1, losing the comment
+a = "type comment with trailing space"  # type: str

crates/ruff_python_formatter/resources/test/fixtures/black/cases/comment_type_hint.py.expect

@@ -0,0 +1,2 @@
+# split out from comments2 as it does not work with line-length=1, losing the comment
+a = "type comment with trailing space"  # type: str

crates/ruff_python_formatter/resources/test/fixtures/black/cases/comments2.py

@@ -155,8 +155,6 @@ class Test:
             pass
 
 
-a = "type comment with trailing space"  # type: str   
-
 #######################
 ### SECTION COMMENT ###
 #######################

crates/ruff_python_formatter/resources/test/fixtures/black/cases/comments2.py.expect

@@ -162,8 +162,6 @@ class Test:
             pass
 
 
-a = "type comment with trailing space"  # type: str
-
 #######################
 ### SECTION COMMENT ###
 #######################

crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip2.py

@@ -1,3 +1,4 @@
+# l2 loses the comment with line-length=1 in preview mode
 l1 = ["This list should be broken up", "into multiple lines", "because it is way too long"]
 l2 = ["But this list shouldn't", "even though it also has", "way too many characters in it"]  # fmt: skip
 l3 = ["I have", "trailing comma", "so I should be braked",]

crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip2.py.expect

@@ -1,3 +1,4 @@
+# l2 loses the comment with line-length=1 in preview mode
 l1 = [
     "This list should be broken up",
     "into multiple lines",

crates/ruff_python_formatter/resources/test/fixtures/black/cases/funcdef_return_type_trailing_comma.options.json

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

crates/ruff_python_formatter/resources/test/fixtures/black/cases/parenthesized_context_managers.options.json

@@ -0,0 +1 @@
+{"target_version": "py310"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/pattern_matching_complex.options.json

@@ -0,0 +1 @@
+{"target_version": "py310"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/pattern_matching_extras.options.json

@@ -0,0 +1 @@
+{"target_version": "py310"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/pattern_matching_generic.options.json

@@ -0,0 +1 @@
+{"target_version": "py310"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/pattern_matching_simple.options.json

@@ -0,0 +1 @@
+{"target_version": "py310"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/pattern_matching_style.options.json

@@ -0,0 +1 @@
+{"target_version": "py310"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep604_union_types_line_breaks.options.json

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

crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_570.options.json

@@ -0,0 +1 @@
+{"target_version": "py38"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_572.options.json

@@ -0,0 +1 @@
+{"target_version": "py38"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_572_py310.options.json

@@ -0,0 +1 @@
+{"target_version": "py310"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_572_py39.options.json

@@ -0,0 +1 @@
+{"target_version": "py39"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_572_remove_parens.options.json

@@ -0,0 +1 @@
+{"target_version": "py38"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_646.options.json

@@ -0,0 +1 @@
+{"target_version": "py311"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_654.options.json

@@ -0,0 +1 @@
+{"target_version": "py311"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_654_style.options.json

@@ -0,0 +1 @@
+{"target_version": "py311"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_allow_empty_first_line.options.json

@@ -0,0 +1 @@
+{"preview": "enabled"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_allow_empty_first_line.py

@@ -0,0 +1,62 @@
+def foo():
+    """
+    Docstring
+    """
+
+    # Here we go
+    if x:
+
+        # This is also now fine
+        a = 123
+
+    else:
+        # But not necessary
+        a = 123
+
+    if y:
+
+        while True:
+
+            """
+            Long comment here
+            """
+            a = 123
+    
+    if z:
+
+        for _ in range(100):
+            a = 123
+    else:
+
+        try:
+
+            # this should be ok
+            a = 123
+        except:
+
+            """also this"""
+            a = 123
+
+
+def bar():
+
+    if x:
+        a = 123
+
+
+def baz():
+
+    # OK
+    if x:
+        a = 123
+
+def quux():
+
+    new_line = here
+
+
+class Cls:
+
+    def method(self):
+
+        pass

crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_allow_empty_first_line.py.expect

@@ -0,0 +1,62 @@
+def foo():
+    """
+    Docstring
+    """
+
+    # Here we go
+    if x:
+
+        # This is also now fine
+        a = 123
+
+    else:
+        # But not necessary
+        a = 123
+
+    if y:
+
+        while True:
+
+            """
+            Long comment here
+            """
+            a = 123
+
+    if z:
+
+        for _ in range(100):
+            a = 123
+    else:
+
+        try:
+
+            # this should be ok
+            a = 123
+        except:
+
+            """also this"""
+            a = 123
+
+
+def bar():
+
+    if x:
+        a = 123
+
+
+def baz():
+
+    # OK
+    if x:
+        a = 123
+
+
+def quux():
+
+    new_line = here
+
+
+class Cls:
+    def method(self):
+
+        pass

crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_context_managers_38.options.json

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

crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_context_managers_39.options.json

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

crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_context_managers_autodetect_310.options.json

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

crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_context_managers_autodetect_311.options.json

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

crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_context_managers_autodetect_39.options.json

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

crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_dummy_implementations.py

@@ -1,8 +1,10 @@
 from typing import NoReturn, Protocol, Union, overload
 
+class Empty:
+    ...
 
 def dummy(a): ...
-def other(b): ...
+async def other(b): ...
 
 
 @overload
@@ -46,3 +48,11 @@ def b(arg: Union[int, str, object]) -> Union[int, str]:
     if not isinstance(arg, (int, str)):
         raise TypeError
     return arg
+
+def has_comment():
+    ...  # still a dummy
+
+if some_condition:
+    ...
+
+if already_dummy: ...

crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_dummy_implementations.py.expect

@@ -1,8 +1,11 @@
 from typing import NoReturn, Protocol, Union, overload
 
 
+class Empty: ...
+
+
 def dummy(a): ...
-def other(b): ...
+async def other(b): ...
 
 
 @overload
@@ -46,3 +49,13 @@ def b(arg: Union[int, str, object]) -> Union[int, str]:
     if not isinstance(arg, (int, str)):
         raise TypeError
     return arg
+
+
+def has_comment(): ...  # still a dummy
+
+
+if some_condition:
+    ...
+
+if already_dummy:
+    ...

crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_form_feeds.py.expect

@@ -74,6 +74,7 @@ pass
 
 # form feeds are prohibited inside blocks, or on a line with nonwhitespace
 def bar(a=1, b: bool = False):
+
     pass
 
 

crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_hug_parens_with_braces_and_square_brackets.py

@@ -124,23 +124,6 @@ func([x for x in "short line"])
 func([x for x in "long line long line long line long line long line long line long line"])
 func([x for x in [x for x in "long line long line long line long line long line long line long line"]])
 
-func({"short line"})
-func({"long line", "long long line", "long long long line", "long long long long line", "long long long long long line"})
-func({{"long line", "long long line", "long long long line", "long long long long line", "long long long long long line"}})
-func(("long line", "long long line", "long long long line", "long long long long line", "long long long long long line"))
-func((("long line", "long long line", "long long long line", "long long long long line", "long long long long long line")))
-func([["long line", "long long line", "long long long line", "long long long long line", "long long long long long line"]])
-
-# Do not hug if the argument fits on a single line.
-func({"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"})
-func(("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"))
-func(["fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"])
-func(**{"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit---"})
-func(*("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit----"))
-array = [{"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"}]
-array = [("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line")]
-array = [["fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"]]
-
 foooooooooooooooooooo(
     [{c: n + 1 for c in range(256)} for n in range(100)] + [{}], {size}
 )
@@ -150,14 +133,11 @@ baaaaaaaaaaaaar(
 )
 
 nested_mapping = {"key": [{"a very long key 1": "with a very long value", "a very long key 2": "with a very long value"}]}
-nested_array = [[["long line", "long long line", "long long long line", "long long long long line", "long long long long long line"]]]
 explicit_exploding = [[["short", "line",],],]
 single_item_do_not_explode = Context({
     "version": get_docs_version(),
 })
 
-foo(*["long long long long long line", "long long long long long line", "long long long long long line"])
-
 foo(*[str(i) for i in range(100000000000000000000000000000000000000000000000000000000000)])
 
 foo(

crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_hug_parens_with_braces_and_square_brackets.py.expect

@@ -122,69 +122,6 @@ func([
     ]
 ])
 
-func({"short line"})
-func({
-    "long line",
-    "long long line",
-    "long long long line",
-    "long long long long line",
-    "long long long long long line",
-})
-func({{
-    "long line",
-    "long long line",
-    "long long long line",
-    "long long long long line",
-    "long long long long long line",
-}})
-func((
-    "long line",
-    "long long line",
-    "long long long line",
-    "long long long long line",
-    "long long long long long line",
-))
-func(((
-    "long line",
-    "long long line",
-    "long long long line",
-    "long long long long line",
-    "long long long long long line",
-)))
-func([[
-    "long line",
-    "long long line",
-    "long long long line",
-    "long long long long line",
-    "long long long long long line",
-]])
-
-# Do not hug if the argument fits on a single line.
-func(
-    {"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"}
-)
-func(
-    ("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line")
-)
-func(
-    ["fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"]
-)
-func(
-    **{"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit---"}
-)
-func(
-    *("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit----")
-)
-array = [
-    {"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"}
-]
-array = [
-    ("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line")
-]
-array = [
-    ["fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"]
-]
-
 foooooooooooooooooooo(
     [{c: n + 1 for c in range(256)} for n in range(100)] + [{}], {size}
 )
@@ -199,13 +136,6 @@ nested_mapping = {
         "a very long key 2": "with a very long value",
     }]
 }
-nested_array = [[[
-    "long line",
-    "long long line",
-    "long long long line",
-    "long long long long line",
-    "long long long long long line",
-]]]
 explicit_exploding = [
     [
         [
@@ -218,12 +148,6 @@ single_item_do_not_explode = Context({
     "version": get_docs_version(),
 })
 
-foo(*[
-    "long long long long long line",
-    "long long long long long line",
-    "long long long long long line",
-])
-
 foo(*[
     str(i) for i in range(100000000000000000000000000000000000000000000000000000000000)
 ])

crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_hug_parens_with_braces_and_square_brackets_no_ll1.options.json

@@ -0,0 +1 @@
+{"preview": "enabled"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_hug_parens_with_braces_and_square_brackets_no_ll1.py

@@ -0,0 +1,23 @@
+# split out from preview_hug_parens_with_brackes_and_square_brackets, as it produces
+# different code on the second pass with line-length 1 in many cases.
+# Seems to be about whether the last string in a sequence gets wrapped in parens or not.
+foo(*["long long long long long line", "long long long long long line", "long long long long long line"])
+func({"short line"})
+func({"long line", "long long line", "long long long line", "long long long long line", "long long long long long line"})
+func({{"long line", "long long line", "long long long line", "long long long long line", "long long long long long line"}})
+func(("long line", "long long line", "long long long line", "long long long long line", "long long long long long line"))
+func((("long line", "long long line", "long long long line", "long long long long line", "long long long long long line")))
+func([["long line", "long long line", "long long long line", "long long long long line", "long long long long long line"]])
+
+
+# Do not hug if the argument fits on a single line.
+func({"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"})
+func(("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"))
+func(["fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"])
+func(**{"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit---"})
+func(*("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit----"))
+array = [{"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"}]
+array = [("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line")]
+array = [["fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"]]
+
+nested_array = [[["long line", "long long line", "long long long line", "long long long long line", "long long long long long line"]]]

crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_hug_parens_with_braces_and_square_brackets_no_ll1.py.expect

@@ -0,0 +1,79 @@
+# split out from preview_hug_parens_with_brackes_and_square_brackets, as it produces
+# different code on the second pass with line-length 1 in many cases.
+# Seems to be about whether the last string in a sequence gets wrapped in parens or not.
+foo(*[
+    "long long long long long line",
+    "long long long long long line",
+    "long long long long long line",
+])
+func({"short line"})
+func({
+    "long line",
+    "long long line",
+    "long long long line",
+    "long long long long line",
+    "long long long long long line",
+})
+func({{
+    "long line",
+    "long long line",
+    "long long long line",
+    "long long long long line",
+    "long long long long long line",
+}})
+func((
+    "long line",
+    "long long line",
+    "long long long line",
+    "long long long long line",
+    "long long long long long line",
+))
+func(((
+    "long line",
+    "long long line",
+    "long long long line",
+    "long long long long line",
+    "long long long long long line",
+)))
+func([[
+    "long line",
+    "long long line",
+    "long long long line",
+    "long long long long line",
+    "long long long long long line",
+]])
+
+
+# Do not hug if the argument fits on a single line.
+func(
+    {"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"}
+)
+func(
+    ("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line")
+)
+func(
+    ["fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"]
+)
+func(
+    **{"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit---"}
+)
+func(
+    *("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit----")
+)
+array = [
+    {"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"}
+]
+array = [
+    ("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line")
+]
+array = [
+    ["fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"]
+]
+
+nested_array = [[[
+    "long line",
+    "long long line",
+    "long long long line",
+    "long long long long line",
+    "long long long long long line",
+]]]

crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_pattern_matching_long.options.json

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

crates/ruff_python_formatter/resources/test/fixtures/black/cases/preview_pattern_matching_trailing_comma.options.json

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

crates/ruff_python_formatter/resources/test/fixtures/black/cases/py310_pep572.options.json

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

crates/ruff_python_formatter/resources/test/fixtures/black/cases/python37.options.json

@@ -0,0 +1 @@
+{"target_version": "py37"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/python38.options.json

@@ -0,0 +1 @@
+{"target_version": "py38"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/python39.options.json

@@ -0,0 +1 @@
+{"target_version": "py39"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_newline_after_match.options.json

@@ -0,0 +1 @@
+{"target_version": "py310"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/remove_with_brackets.options.json

@@ -0,0 +1 @@
+{"target_version": "py39"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/starred_for_target.options.json

@@ -0,0 +1 @@
+{"target_version": "py310"}

crates/ruff_python_formatter/resources/test/fixtures/black/cases/type_params.options.json

@@ -0,0 +1 @@
+{"target_version": "py312"}

crates/ruff_python_formatter/resources/test/fixtures/import_black_tests.py

@@ -51,6 +51,11 @@ def import_fixture(fixture: Path, fixture_set: str):
                 length = int(length)
                 options["line_width"] = 1 if length == 0 else length
 
+            if "--minimum-version=" in flags:
+                [_, version] = flags.split("--minimum-version=", 1)
+                # Convert 3.10 to py310
+                options["target_version"] = f"py{version.strip().replace('.', '')}"
+
             if "--skip-magic-trailing-comma" in flags:
                 options["magic_trailing_comma"] = "ignore"