Skip to content

Commit c6d8076

Browse files
MichaReiserMichaReiser
authored
Set target versions in Black tests (#9221)
1 parent 8cb7950 commit c6d8076

File tree

55 files changed

+996
-466
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+996
-466
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# split out from comments2 as it does not work with line-length=1, losing the comment
2+
a = "type comment with trailing space" # type: str

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# split out from comments2 as it does not work with line-length=1, losing the comment
2+
a = "type comment with trailing space" # type: str

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,6 @@ def _init_host(self, parsed) -> None:
155155
pass
156156

157157

158-
a = "type comment with trailing space" # type: str
159-
160158
#######################
161159
### SECTION COMMENT ###
162160
#######################

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,6 @@ class Test:
162162
pass
163163

164164

165-
a = "type comment with trailing space" # type: str
166-
167165
#######################
168166
### SECTION COMMENT ###
169167
#######################

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

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# l2 loses the comment with line-length=1 in preview mode
12
l1 = [
23
"This list should be broken up",
34
"into multiple lines",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"preview": "enabled"}
1+
{"preview": "enabled", "target_version": "py310"}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"target_version": "py310"}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"target_version": "py310"}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"target_version": "py310"}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"target_version": "py310"}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"target_version": "py310"}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"target_version": "py310"}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"preview": "enabled"}
1+
{"preview": "enabled", "target_version": "py310"}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"target_version": "py38"}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"target_version": "py38"}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"target_version": "py310"}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"target_version": "py39"}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"target_version": "py38"}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"target_version": "py311"}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"target_version": "py311"}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"target_version": "py311"}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"preview": "enabled"}

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

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
def foo():
2+
"""
3+
Docstring
4+
"""
5+
6+
# Here we go
7+
if x:
8+
9+
# This is also now fine
10+
a = 123
11+
12+
else:
13+
# But not necessary
14+
a = 123
15+
16+
if y:
17+
18+
while True:
19+
20+
"""
21+
Long comment here
22+
"""
23+
a = 123
24+
25+
if z:
26+
27+
for _ in range(100):
28+
a = 123
29+
else:
30+
31+
try:
32+
33+
# this should be ok
34+
a = 123
35+
except:
36+
37+
"""also this"""
38+
a = 123
39+
40+
41+
def bar():
42+
43+
if x:
44+
a = 123
45+
46+
47+
def baz():
48+
49+
# OK
50+
if x:
51+
a = 123
52+
53+
def quux():
54+
55+
new_line = here
56+
57+
58+
class Cls:
59+
60+
def method(self):
61+
62+
pass

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

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
def foo():
2+
"""
3+
Docstring
4+
"""
5+
6+
# Here we go
7+
if x:
8+
9+
# This is also now fine
10+
a = 123
11+
12+
else:
13+
# But not necessary
14+
a = 123
15+
16+
if y:
17+
18+
while True:
19+
20+
"""
21+
Long comment here
22+
"""
23+
a = 123
24+
25+
if z:
26+
27+
for _ in range(100):
28+
a = 123
29+
else:
30+
31+
try:
32+
33+
# this should be ok
34+
a = 123
35+
except:
36+
37+
"""also this"""
38+
a = 123
39+
40+
41+
def bar():
42+
43+
if x:
44+
a = 123
45+
46+
47+
def baz():
48+
49+
# OK
50+
if x:
51+
a = 123
52+
53+
54+
def quux():
55+
56+
new_line = here
57+
58+
59+
class Cls:
60+
def method(self):
61+
62+
pass

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"preview": "enabled"}
1+
{"preview": "enabled", "target_version": "py38"}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"preview": "enabled"}
1+
{"preview": "enabled", "target_version": "py39"}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"preview": "enabled"}
1+
{"preview": "enabled", "target_version": "py310"}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"preview": "enabled"}
1+
{"preview": "enabled", "target_version": "py311"}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"preview": "enabled"}
1+
{"preview": "enabled", "target_version": "py39"}

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
from typing import NoReturn, Protocol, Union, overload
22

3+
class Empty:
4+
...
35

46
def dummy(a): ...
5-
def other(b): ...
7+
async def other(b): ...
68

79

810
@overload
@@ -46,3 +48,11 @@ def b(arg: Union[int, str, object]) -> Union[int, str]:
4648
if not isinstance(arg, (int, str)):
4749
raise TypeError
4850
return arg
51+
52+
def has_comment():
53+
... # still a dummy
54+
55+
if some_condition:
56+
...
57+
58+
if already_dummy: ...

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
from typing import NoReturn, Protocol, Union, overload
22

33

4+
class Empty: ...
5+
6+
47
def dummy(a): ...
5-
def other(b): ...
8+
async def other(b): ...
69

710

811
@overload
@@ -46,3 +49,13 @@ def b(arg: Union[int, str, object]) -> Union[int, str]:
4649
if not isinstance(arg, (int, str)):
4750
raise TypeError
4851
return arg
52+
53+
54+
def has_comment(): ... # still a dummy
55+
56+
57+
if some_condition:
58+
...
59+
60+
if already_dummy:
61+
...

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ pass
7474

7575
# form feeds are prohibited inside blocks, or on a line with nonwhitespace
7676
def bar(a=1, b: bool = False):
77+
7778
pass
7879

7980

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -124,23 +124,6 @@ def foo_square_brackets(request):
124124
func([x for x in "long line long line long line long line long line long line long line"])
125125
func([x for x in [x for x in "long line long line long line long line long line long line long line"]])
126126

127-
func({"short line"})
128-
func({"long line", "long long line", "long long long line", "long long long long line", "long long long long long line"})
129-
func({{"long line", "long long line", "long long long line", "long long long long line", "long long long long long line"}})
130-
func(("long line", "long long line", "long long long line", "long long long long line", "long long long long long line"))
131-
func((("long line", "long long line", "long long long line", "long long long long line", "long long long long long line")))
132-
func([["long line", "long long line", "long long long line", "long long long long line", "long long long long long line"]])
133-
134-
# Do not hug if the argument fits on a single line.
135-
func({"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"})
136-
func(("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"))
137-
func(["fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"])
138-
func(**{"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit---"})
139-
func(*("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit----"))
140-
array = [{"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"}]
141-
array = [("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line")]
142-
array = [["fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"]]
143-
144127
foooooooooooooooooooo(
145128
[{c: n + 1 for c in range(256)} for n in range(100)] + [{}], {size}
146129
)
@@ -150,14 +133,11 @@ def foo_square_brackets(request):
150133
)
151134

152135
nested_mapping = {"key": [{"a very long key 1": "with a very long value", "a very long key 2": "with a very long value"}]}
153-
nested_array = [[["long line", "long long line", "long long long line", "long long long long line", "long long long long long line"]]]
154136
explicit_exploding = [[["short", "line",],],]
155137
single_item_do_not_explode = Context({
156138
"version": get_docs_version(),
157139
})
158140

159-
foo(*["long long long long long line", "long long long long long line", "long long long long long line"])
160-
161141
foo(*[str(i) for i in range(100000000000000000000000000000000000000000000000000000000000)])
162142

163143
foo(

0 commit comments

Comments
 (0)