actions/black
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Format ourselves in preview mode (#2889)

Browse Source
This commit is contained in:
Jelle Zijlstra 2022-02-23 18:20:59 -08:00 committed by GitHub
parent 7e2b2d4784
commit 2918ea3b07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pyproject.toml
View File

@ -17,7 +17,10 @@ extend-exclude = '''
| profiling | profiling
)/ )/
''' '''
# We use preview style for formatting Black itself. If you
# want stable formatting across releases, you should keep
# this off.
preview = true
# Build system information below. # Build system information below.
# NOTE: You don't need this in your own Black configuration. # NOTE: You don't need this in your own Black configuration.

8
src/black/__init__.py
View File

@ -1358,10 +1358,10 @@ def assert_equivalent(src: str, dst: str) -> None:
src_ast = parse_ast(src) src_ast = parse_ast(src)
except Exception as exc: except Exception as exc:
raise AssertionError( raise AssertionError(
f"cannot use --safe with this file; failed to parse source file AST: " "cannot use --safe with this file; failed to parse source file AST: "
f"{exc}\n" f"{exc}\n"
f"This could be caused by running Black with an older Python version " "This could be caused by running Black with an older Python version "
f"that does not support new syntax used in your source file." "that does not support new syntax used in your source file."
) from exc ) from exc
try: try:
@ -1380,7 +1380,7 @@ def assert_equivalent(src: str, dst: str) -> None:
log = dump_to_file(diff(src_ast_str, dst_ast_str, "src", "dst")) log = dump_to_file(diff(src_ast_str, dst_ast_str, "src", "dst"))
raise AssertionError( raise AssertionError(
"INTERNAL ERROR: Black produced code that is not equivalent to the" "INTERNAL ERROR: Black produced code that is not equivalent to the"
f" source. Please report a bug on " " source. Please report a bug on "
f"https://github.com/psf/black/issues. This diff might be helpful: {log}" f"https://github.com/psf/black/issues. This diff might be helpful: {log}"
) from None ) from None

4
tests/test_ipynb.py
View File

@ -415,7 +415,7 @@ def test_ipynb_diff_with_change() -> None:
f"--config={EMPTY_CONFIG}", f"--config={EMPTY_CONFIG}",
], ],
) )
expected = "@@ -1,3 +1,3 @@\n %%time\n \n-print('foo')\n" '+print("foo")\n' expected = "@@ -1,3 +1,3 @@\n %%time\n \n-print('foo')\n+print(\"foo\")\n"
assert expected in result.output assert expected in result.output
@ -494,7 +494,7 @@ def test_ipynb_flag(tmp_path: pathlib.Path) -> None:
f"--config={EMPTY_CONFIG}", f"--config={EMPTY_CONFIG}",
], ],
) )
expected = "@@ -1,3 +1,3 @@\n %%time\n \n-print('foo')\n" '+print("foo")\n' expected = "@@ -1,3 +1,3 @@\n %%time\n \n-print('foo')\n+print(\"foo\")\n"
assert expected in result.output assert expected in result.output