Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set target versions in Black tests #9221

Merged
merged 1 commit into from
Dec 21, 2023
+996 −466
Merged

Set target versions in Black tests #9221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions crates/ruff_python_formatter/resources/test/fixtures/black/cases/comment_type_hint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions crates/ruff_python_formatter/resources/test/fixtures/black/cases/comment_type_hint.py.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions crates/ruff_python_formatter/resources/test/fixtures/black/cases/comments2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,6 @@ def _init_host(self, parsed) -> None:
pass


a = "type comment with trailing space" # type: str

#######################
### SECTION COMMENT ###
#######################
Expand Down
2 changes: 0 additions & 2 deletions crates/ruff_python_formatter/resources/test/fixtures/black/cases/comments2.py.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,6 @@ class Test:
pass


a = "type comment with trailing space" # type: str

#######################
### SECTION COMMENT ###
#######################
Expand Down
1 change: 1 addition & 0 deletions crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",]
1 change: 1 addition & 0 deletions crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip2.py.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ...atter/resources/test/fixtures/black/cases/funcdef_return_type_trailing_comma.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"preview": "enabled"}
{"preview": "enabled", "target_version": "py310"}
1 change: 1 addition & 0 deletions ...formatter/resources/test/fixtures/black/cases/parenthesized_context_managers.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"target_version": "py310"}
1 change: 1 addition & 0 deletions ...ython_formatter/resources/test/fixtures/black/cases/pattern_matching_complex.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"target_version": "py310"}
1 change: 1 addition & 0 deletions ...python_formatter/resources/test/fixtures/black/cases/pattern_matching_extras.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"target_version": "py310"}
1 change: 1 addition & 0 deletions ...ython_formatter/resources/test/fixtures/black/cases/pattern_matching_generic.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"target_version": "py310"}
1 change: 1 addition & 0 deletions ...python_formatter/resources/test/fixtures/black/cases/pattern_matching_simple.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"target_version": "py310"}
1 change: 1 addition & 0 deletions ..._python_formatter/resources/test/fixtures/black/cases/pattern_matching_style.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"target_version": "py310"}
2 changes: 1 addition & 1 deletion ...formatter/resources/test/fixtures/black/cases/pep604_union_types_line_breaks.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"preview": "enabled"}
{"preview": "enabled", "target_version": "py310"}
1 change: 1 addition & 0 deletions crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_570.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"target_version": "py38"}
1 change: 1 addition & 0 deletions crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_572.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"target_version": "py38"}
1 change: 1 addition & 0 deletions crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_572_py310.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"target_version": "py310"}
1 change: 1 addition & 0 deletions crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_572_py39.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"target_version": "py39"}
1 change: 1 addition & 0 deletions ...f_python_formatter/resources/test/fixtures/black/cases/pep_572_remove_parens.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"target_version": "py38"}
1 change: 1 addition & 0 deletions crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_646.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"target_version": "py311"}
1 change: 1 addition & 0 deletions crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_654.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"target_version": "py311"}
1 change: 1 addition & 0 deletions crates/ruff_python_formatter/resources/test/fixtures/black/cases/pep_654_style.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"target_version": "py311"}
1 change: 1 addition & 0 deletions ...formatter/resources/test/fixtures/black/cases/preview_allow_empty_first_line.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"preview": "enabled"}
62 changes: 62 additions & 0 deletions ...ff_python_formatter/resources/test/fixtures/black/cases/preview_allow_empty_first_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
62 changes: 62 additions & 0 deletions ...on_formatter/resources/test/fixtures/black/cases/preview_allow_empty_first_line.py.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion ...on_formatter/resources/test/fixtures/black/cases/preview_context_managers_38.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"preview": "enabled"}
{"preview": "enabled", "target_version": "py38"}
2 changes: 1 addition & 1 deletion ...on_formatter/resources/test/fixtures/black/cases/preview_context_managers_39.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"preview": "enabled"}
{"preview": "enabled", "target_version": "py39"}
2 changes: 1 addition & 1 deletion .../resources/test/fixtures/black/cases/preview_context_managers_autodetect_310.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"preview": "enabled"}
{"preview": "enabled", "target_version": "py310"}
2 changes: 1 addition & 1 deletion .../resources/test/fixtures/black/cases/preview_context_managers_autodetect_311.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"preview": "enabled"}
{"preview": "enabled", "target_version": "py311"}
2 changes: 1 addition & 1 deletion ...r/resources/test/fixtures/black/cases/preview_context_managers_autodetect_39.options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"preview": "enabled"}
{"preview": "enabled", "target_version": "py39"}
12 changes: 11 additions & 1 deletion ...uff_python_formatter/resources/test/fixtures/black/cases/preview_dummy_implementations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
from typing import NoReturn, Protocol, Union, overload

class Empty:
...

def dummy(a): ...
def other(b): ...
async def other(b): ...


@overload
Expand Down Expand Up @@ -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: ...
15 changes: 14 additions & 1 deletion ...hon_formatter/resources/test/fixtures/black/cases/preview_dummy_implementations.py.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
from typing import NoReturn, Protocol, Union, overload


class Empty: ...


def dummy(a): ...
def other(b): ...
async def other(b): ...


@overload
Expand Down Expand Up @@ -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:
...
1 change: 1 addition & 0 deletions ...es/ruff_python_formatter/resources/test/fixtures/black/cases/preview_form_feeds.py.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
20 changes: 0 additions & 20 deletions ...resources/test/fixtures/black/cases/preview_hug_parens_with_braces_and_square_brackets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,23 +124,6 @@ def foo_square_brackets(request):
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}
)
Expand All @@ -150,14 +133,11 @@ def foo_square_brackets(request):
)

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(
Expand Down