Skip to content

Comments

Update Black tests#20794

Merged
ntBre merged 6 commits intomainfrom
brent/import-black-tests
Oct 14, 2025
Merged

Update Black tests#20794
ntBre merged 6 commits intomainfrom
brent/import-black-tests

Conversation

@ntBre
Copy link
Contributor

@ntBre ntBre commented Oct 9, 2025 •
edited
Loading

Summary

git clone [email protected]:psf/black.git ../other/black
crates/ruff_python_formatter/resources/test/fixtures/import_black_tests.py ../other/black

Then ran our tests and accepted the snapshots

I had to make a small fix to our tuple normalization logic for del statements
in the second commit, otherwise the tests were panicking at a changed AST. I
think the new implementation is closer to the intention described in the nearby
comment anyway, though.

The first commit adds the new Python, settings, and .expect files, the next three commits make some small
fixes to help get the tests running, and then the fifth commit accepts all but one of the new snapshots. The last commit includes the new unsupported syntax error for one f-string example, tracked in #20774.

Test Plan

Newly imported tests. I went through all of the new snapshots and added review comments below. I think they're all expected, except a few cases I wasn't 100% sure about.

@ntBre ntBre added internal An internal refactor or improvement formatter Related to the formatter labels Oct 9, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Oct 9, 2025 •
edited
Loading

ruff-ecosystem results

Formatter (stable)

✅ ecosystem check detected no format changes.

Formatter (preview)

✅ ecosystem check detected no format changes.

Base automatically changed from brent/render-syntax-errors to main October 13, 2025 14:00
@ntBre ntBre force-pushed the brent/import-black-tests branch from 962fb05 to a48d96d Compare October 13, 2025 16:52
ntBre
ntBre commented Oct 13, 2025
View reviewed changes
ntBre added 6 commits October 13, 2025 15:09
@ntBre
Update Black tests
46e6837 
This is currently stacked on #20777 to remove the panic from introducing the new
syntax error tracked in #20774. I also still need to go through the other new
deviations to make sure they look reasonable.

Summary
--

```shell
git clone [email protected]:psf/black.git ../other/black
crates/ruff_python_formatter/resources/test/fixtures/import_black_tests.py ../other/black
```

Then ran our tests and accepted the snapshots

I had to make a small fix to our tuple normalization logic for `del` statements
in the second commit, otherwise the tests were panicking at a changed AST. I
think the new implementation is closer to the intention described in the nearby
comment anyway, though.

The first commit adds the new files, the next three commits make some small
fixes to help get the tests running, and then the last commit accepts all of the
new snapshots, including the new unsupported syntax error for one f-string
example, tracked in #20774.

Test Plan
--

Newly imported tests
@ntBre
only normalize a single top-level tuple in the del ast
5f65e32 
this was causing an issue with a new black test:

```py
del ([], name_1, name_2), [(), [], name_4, name_3], name_1[[name_2 for name_1 in name_0]]
```

we were flattening the first argument since it happened to be a tuple instead of
what seems to be the intended case mentioned in the comment where the only `del`
target is a tuple (which this example also triggers *after* formatting)
@ntBre
update python version syntax for version overrides
8090958
@ntBre
snapshot any new unsupported syntax errors
3f88fbe
@ntBre
accept normal difference snapshots
f08aba3
@ntBre
accept new unsupported syntax errors
a362ddb
@ntBre ntBre force-pushed the brent/import-black-tests branch from a48d96d to a362ddb Compare October 13, 2025 19:13
@ntBre ntBre marked this pull request as ready for review October 13, 2025 19:24
@ntBre ntBre requested a review from MichaReiser as a code owner October 13, 2025 19:24
@MichaReiser MichaReiser added testing Related to testing Ruff itself and removed internal An internal refactor or improvement labels Oct 14, 2025
MichaReiser
MichaReiser reviewed Oct 14, 2025
View reviewed changes
...ruff_python_formatter/tests/snapshots/black_compatibility@cases__type_param_defaults.py.snap
-](
- a: str,
-):
+](a: str):
Copy link
Member

@MichaReiser MichaReiser Oct 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, we ignore the trailing comma

Copy link
Contributor Author

@ntBre ntBre Oct 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, this might actually be okay. This is the input:

def trailing_comma1[T=int,](a: str):
    pass

So we respect the trailing comma in the type parameters, and there's no trailing comma in the function parameters.

MichaReiser
MichaReiser approved these changes Oct 14, 2025
View reviewed changes
Copy link
Member

@MichaReiser MichaReiser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the detailed analysis.

@ntBre ntBre merged commit 1ed9b21 into main Oct 14, 2025
38 checks passed
@ntBre ntBre deleted the brent/import-black-tests branch October 14, 2025 14:15
dcreager added a commit that referenced this pull request Oct 15, 2025
@dcreager
Merge remote-tracking branch 'origin/main' into dcreager/non-non-infe…
68fc51c 
…rable

* origin/main:
  [ty] Add (unused) `inferable` parameter to type property methods (#20865)
  Run macos tests on macos (#20889)
  Remove `release` CI job (#20887)
  [ty] CI: Faster ecosystem analysis (#20886)
  Remove `strip` from release profile (#20885)
  [ty] Sync vendored typeshed stubs (#20876)
  [ty] Add some completion ranking improvements (#20807)
  Improved error recovery for unclosed strings (including f- and t-strings) (#20848)
  Enable lto=fat (#20863)
  [`pyupgrade`] Extend `UP019` to detect `typing_extensions.Text` (`UP019`) (#20825)
  [`flake8-bugbear`] Omit annotation in preview fix for `B006` (#20877)
  fix(docs): Fix typo in `RUF015` description (#20873)
  [ty] Improve and extend tests for instance attributes redeclared in subclasses (#20866)
  [ty] Ignore slow seeds as a temporary measure (#20870)
  Remove parentheses around multiple exception types on Python 3.14+ (#20768)
  Update Black tests (#20794)
dcreager added a commit that referenced this pull request Oct 15, 2025
@dcreager
Merge branch 'dcreager/non-non-inferable' into dcreager/real-constrai…
483073d 
…nt-sets

* dcreager/non-non-inferable: (174 commits)
  [ty] Add (unused) `inferable` parameter to type property methods (#20865)
  Run macos tests on macos (#20889)
  Remove `release` CI job (#20887)
  [ty] CI: Faster ecosystem analysis (#20886)
  Remove `strip` from release profile (#20885)
  [ty] Sync vendored typeshed stubs (#20876)
  [ty] Add some completion ranking improvements (#20807)
  Improved error recovery for unclosed strings (including f- and t-strings) (#20848)
  Enable lto=fat (#20863)
  [`pyupgrade`] Extend `UP019` to detect `typing_extensions.Text` (`UP019`) (#20825)
  [`flake8-bugbear`] Omit annotation in preview fix for `B006` (#20877)
  fix(docs): Fix typo in `RUF015` description (#20873)
  [ty] Improve and extend tests for instance attributes redeclared in subclasses (#20866)
  [ty] Ignore slow seeds as a temporary measure (#20870)
  use existing method
  Remove parentheses around multiple exception types on Python 3.14+ (#20768)
  Update Black tests (#20794)
  just the api parts
  [ty] Fix further issues in `super()` inference logic (#20843)
  [ty] Document when a rule was added (#20859)
  ...
@dylwil3 dylwil3 mentioned this pull request Jan 5, 2026
Merged
dylwil3 added a commit that referenced this pull request Jan 6, 2026
@dylwil3
Update Black tests (#22405)
924b297 
I am updating these because we didn't have test coverage for the
different handling of `fmt: skip` comments applied to multiple
statements on the same line. This is in preparation for #22119 (to show
before/after deviations).

Follows the same procedure as in #20794

Edit: As it happens, the new fixtures do not even cover the case
relevant to #22119 - they just deal with the already handled case of a
one-line compound statement. Nevertheless, it seems worthwhile to make
this update, especially since it uncovered a (possible?) bug.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MichaReiser MichaReiser MichaReiser approved these changes

Assignees

No one assigned

Labels

formatter Related to the formatter testing Related to testing Ruff itself

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ntBre @MichaReiser