Fix bug where # fmt: skip is not being respected with one-liner functions #4552

Pedro-Muller29 · 2025-01-18T07:46:48Z

Description

The fix involves modifying the algorithm that determines which nodes to ignore in the _generate_ignored_nodes_from_fmt_skip function. Specifically, the adjustment applies to cases where the # fmt: skip comment is not immediately after the colon in an if, while, def, class, etc.

Previous Algorithm

The previous algorithm for selecting ignored nodes worked as follows:

Add the previous sibling of the current node to the list of ignored nodes.
Set the current node to its previous sibling.
Stop if the current node has no previous sibling or its previous sibling contains a \n in its prefix.

This approach worked well when the node with the comment existed at a tree level that covered the entire line. However, it failed in cases where this assumption was invalid. For example, consider the tree produced for the code in #4535:

Node(funcdef)
├── Leaf(NAME, 'def')   ─┐
├── Leaf(NAME, 'foo')    │
├── Node(parameters)     │
 │   ├── Leaf(LPAR, '(') │
 │   └── Leaf(RPAR, ')') ┣── This level is never reachable, so they won't be ignored by # fmt: skip.
├── Leaf(COLON, ':')     │
└── Node(simple_stmt)   ─┘
    ├── Leaf(STANDALONE_COMMENT, 'return "mock"  # fmt: skip') <-- The algorithm begins here.
    └── Leaf(NEWLINE, '\n')
Leaf(ENDMARKER, '')

As shown, only the content of the return "mock" # fmt: skip would be ignored.
This can be tested with the following input (note the single quotes):

def foo(): return 'mock' # fmt: skip

The resulting output would be:

def foo():
    return 'mock' # fmt: skip

Here, the single quotes are protected by the skip statement.

New Algorithm

The new algorithm traverses the tree differently, ensuring it can visit all leaves in the order they appear in the source code (but in reverse). For the example tree:

The traversal moves from the comment to the colon (:), then to the RPAR, LPAR, and so on.
It stops when encountering a NEWLINE or INDENT node.
All visited leaves are ignored by # fmt: skip, expect the NEWLINE or INDENT node.

This approach ensures all relevant nodes are included in the ignored list.

Checklist - did you ...

Add an entry in CHANGES.md if necessary?
Add / update tests if necessary?
Add new / update outdated documentation?

Pedro-Muller29 · 2025-01-18T07:53:22Z

I’d also like to mention that I included this in the Stable Style, as I considered it more of a bug fix than a new feature.

However, I’m not yet fully familiar with the criteria for what qualifies as Stable versus Preview Style, and I couldn’t find much information about this in the documentation. Any guidance would be greatly appreciated.

MeGaGiGaGon · 2025-01-18T09:34:59Z

tests/data/cases/fmtskip10.py

@@ -0,0 +1 @@
+def foo(): return "mock"  # fmt: skip


Suggested change

def foo(): return "mock" # fmt: skip

def foo(): return "mock" # fmt: skip

if True: print("yay") # fmt: skip

for i in range(10): print(i) # fmt: skip

Looks to also fix #3682 so this adds two examples from that as test cases. The other issues not fixed by this PR in #3682 look to have been fixed by something in the 03-15-2024 release, probably #4248, so it should be good to add to the close-on-merge list for this PR along with #4535
(To do that, edit the opening description to include
Fixes #3682
Fixes #4535
)

Thanks for the review.

I added the suggested tests + some extra ones.
I also mentioned #3682 on the PR description as suggested.

cobaltt7 · 2025-01-18T14:35:50Z

However, I’m not yet fully familiar with the criteria for what qualifies as Stable versus Preview Style, and I couldn’t find much information about this in the documentation. Any guidance would be greatly appreciated.

Typically speaking, everything should go in the preview style, the only exceptions being bug fixes for crashes and code changes that don't change code that has already been formatted by Black. This fits under the second case, so it does not need to go through the preview style if it doesn't make sense for it to.

Pedro-Muller29 · 2025-01-18T18:09:00Z

However, I’m not yet fully familiar with the criteria for what qualifies as Stable versus Preview Style, and I couldn’t find much information about this in the documentation. Any guidance would be greatly appreciated.

Typically speaking, everything should go in the preview style, the only exceptions being bug fixes for crashes and code changes that don't change code that has already been formatted by Black. This fits under the second case, so it does not need to go through the preview style if it doesn't make sense for it to.

Thank you for the clarification!

I’ve already updated my PR to use the preview style. During this process, the test I added naturally started failing, since it was running on stable mode. I attempted to give the --preview flag to the test case, but it didn’t resolve the issue.

The test only worked when I gave it the --unstable flag, which allowed the code to enter the branch if Preview.fix_fmt_skip_in_one_liners in mode. I noticed that other PRs introducing features to the preview mode (e.g., #4498) also used the --unstable flag in their tests.

Is this the correct approach? If so, could you clarify the intended purpose of the --preview flag in test cases?

JelleZijlstra · 2025-01-19T23:38:04Z

The idea of the stable style is that if you have a codebase formatted with Black (say) 25.1, and you upgrade to Black 25.2, nothing should change. This is useful so that users can upgrade Black and see bugfixes without having to commit reformatting. If this change only affects how Black formats code that wasn't previously formatted by Black.

Putting --preview in a test should be enough. --unstable also enables features in the UNSTABLE_FEATURES set, but shouldn't affect other preview features.

JelleZijlstra · 2025-01-19T23:38:49Z

src/black/comments.py

-            siblings.insert(0, prev_sibling)
-        yield from siblings
+
+        if Preview.multiline_string_handling not in mode:


Wrong preview feature?

Yep, you are absolutely right.

Sorry for missing this. This was the reason for the tests failing in --preview mode (the multiline_string_handling is an unstable feature).

cobaltt7 · 2025-02-06T01:42:03Z

Can you run tox -e generate_schema? This will regenerate the schema for the configuration, which is changed by adding new preview features. That will fix CI failing.

…ns or conditionals (psf#4535) (psf#3682)

Pedro-Muller29 · 2025-02-06T13:04:05Z

Can you run tox -e generate_schema? This will regenerate the schema for the configuration, which is changed by adding new preview features. That will fix CI failing.

Thanks for the response, I wasn't sure how to proceed. I searched in the docs but I couldn't find anything that related to the CI error. Is there any other places that contains this info? (I searched on the ReadTheDocs page in the development section).

Thanks in advance.

Pedro-Muller29 · 2025-02-06T13:09:38Z

Now the CI seems to be failing because of the deprecation of the upload-artifact v3 action in the .github/workflows/diff_shades.yml workflow, as can be seen here.

MeGaGiGaGon · 2025-02-07T03:35:09Z

@Pedro-Muller29 I just fixed that in #4576, @JelleZijlstra could you re-run those two?

…ions (psf#4552)

This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [black](https://github.com/psf/black) ([changelog](https://github.com/psf/black/blob/main/CHANGES.md)) | `<25.2.0,>=25.1.0` -> `<25.9.1,>=25.9.0` | [![age](https://developer.mend.io/api/mc/badges/age/pypi/black/25.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/black/25.1.0/25.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>psf/black (black)</summary> ### [`v25.9.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#2590) [Compare Source](psf/black@25.1.0...25.9.0) ##### Highlights - Remove support for pre-python 3.7 `await/async` as soft keywords/variable names ([#4676](psf/black#4676)) ##### Stable style - Fix crash while formatting a long `del` statement containing tuples ([#4628](psf/black#4628)) - Fix crash while formatting expressions using the walrus operator in complex `with` statements ([#4630](psf/black#4630)) - Handle `# fmt: skip` followed by a comment at the end of file ([#4635](psf/black#4635)) - Fix crash when a tuple appears in the `as` clause of a `with` statement ([#4634](psf/black#4634)) - Fix crash when tuple is used as a context manager inside a `with` statement ([#4646](psf/black#4646)) - Fix crash when formatting a `\` followed by a `\r` followed by a comment ([#4663](psf/black#4663)) - Fix crash on a `\\r\n` ([#4673](psf/black#4673)) - Fix crash on `await ...` (where `...` is a literal `Ellipsis`) ([#4676](psf/black#4676)) - Fix crash on parenthesized expression inside a type parameter bound ([#4684](psf/black#4684)) - Fix crash when using line ranges excluding indented single line decorated items ([#4670](psf/black#4670)) ##### Preview style - Fix a bug where one-liner functions/conditionals marked with `# fmt: skip` would still be formatted ([#4552](psf/black#4552)) - Improve `multiline_string_handling` with ternaries and dictionaries ([#4657](psf/black#4657)) - Fix a bug where `string_processing` would not split f-strings directly after expressions ([#4680](psf/black#4680)) - Wrap the `in` clause of comprehensions across lines if necessary ([#4699](psf/black#4699)) - Remove parentheses around multiple exception types in `except` and `except*` without `as`. ([#4720](psf/black#4720)) - Add `\r` style newlines to the potential newlines to normalize file newlines both from and to ([#4710](psf/black#4710)) ##### Parser - Rewrite tokenizer to improve performance and compliance ([#4536](psf/black#4536)) - Fix bug where certain unusual expressions (e.g., lambdas) were not accepted in type parameter bounds and defaults. ([#4602](psf/black#4602)) ##### Performance - Avoid using an extra process when running with only one worker ([#4734](psf/black#4734)) ##### Integrations - Fix the version check in the vim file to reject Python 3.8 ([#4567](psf/black#4567)) - Enhance GitHub Action `psf/black` to read Black version from an additional section in pyproject.toml: `[project.dependency-groups]` ([#4606](psf/black#4606)) - Build gallery docker image with python3-slim and reduce image size ([#4686](psf/black#4686)) ##### Documentation - Add FAQ entry for windows emoji not displaying ([#4714](psf/black#4714)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://git.tainton.uk/repos/roboluke/pulls/376 Co-authored-by: Renovate [BOT] <renovate-bot@git.tainton.uk> Co-committed-by: Renovate [BOT] <renovate-bot@git.tainton.uk>

This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [black](https://github.com/psf/black) ([changelog](https://github.com/psf/black/blob/main/CHANGES.md)) | `<25.2.0,>=25.1.0` -> `<25.9.1,>=25.9.0` | [![age](https://developer.mend.io/api/mc/badges/age/pypi/black/25.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/black/25.1.0/25.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>psf/black (black)</summary> ### [`v25.9.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#2590) [Compare Source](psf/black@25.1.0...25.9.0) ##### Highlights - Remove support for pre-python 3.7 `await/async` as soft keywords/variable names ([#4676](psf/black#4676)) ##### Stable style - Fix crash while formatting a long `del` statement containing tuples ([#4628](psf/black#4628)) - Fix crash while formatting expressions using the walrus operator in complex `with` statements ([#4630](psf/black#4630)) - Handle `# fmt: skip` followed by a comment at the end of file ([#4635](psf/black#4635)) - Fix crash when a tuple appears in the `as` clause of a `with` statement ([#4634](psf/black#4634)) - Fix crash when tuple is used as a context manager inside a `with` statement ([#4646](psf/black#4646)) - Fix crash when formatting a `\` followed by a `\r` followed by a comment ([#4663](psf/black#4663)) - Fix crash on a `\\r\n` ([#4673](psf/black#4673)) - Fix crash on `await ...` (where `...` is a literal `Ellipsis`) ([#4676](psf/black#4676)) - Fix crash on parenthesized expression inside a type parameter bound ([#4684](psf/black#4684)) - Fix crash when using line ranges excluding indented single line decorated items ([#4670](psf/black#4670)) ##### Preview style - Fix a bug where one-liner functions/conditionals marked with `# fmt: skip` would still be formatted ([#4552](psf/black#4552)) - Improve `multiline_string_handling` with ternaries and dictionaries ([#4657](psf/black#4657)) - Fix a bug where `string_processing` would not split f-strings directly after expressions ([#4680](psf/black#4680)) - Wrap the `in` clause of comprehensions across lines if necessary ([#4699](psf/black#4699)) - Remove parentheses around multiple exception types in `except` and `except*` without `as`. ([#4720](psf/black#4720)) - Add `\r` style newlines to the potential newlines to normalize file newlines both from and to ([#4710](psf/black#4710)) ##### Parser - Rewrite tokenizer to improve performance and compliance ([#4536](psf/black#4536)) - Fix bug where certain unusual expressions (e.g., lambdas) were not accepted in type parameter bounds and defaults. ([#4602](psf/black#4602)) ##### Performance - Avoid using an extra process when running with only one worker ([#4734](psf/black#4734)) ##### Integrations - Fix the version check in the vim file to reject Python 3.8 ([#4567](psf/black#4567)) - Enhance GitHub Action `psf/black` to read Black version from an additional section in pyproject.toml: `[project.dependency-groups]` ([#4606](psf/black#4606)) - Build gallery docker image with python3-slim and reduce image size ([#4686](psf/black#4686)) ##### Documentation - Add FAQ entry for windows emoji not displaying ([#4714](psf/black#4714)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://git.tainton.uk/repos/epage/pulls/158 Co-authored-by: Renovate [BOT] <renovate-bot@git.tainton.uk> Co-committed-by: Renovate [BOT] <renovate-bot@git.tainton.uk>

This MR contains the following updates: | Package | Type | Update | Change | OpenSSF | |---|---|---|---|---| | [black](https://github.com/psf/black) ([changelog](https://github.com/psf/black/blob/main/CHANGES.md)) | dev | major | `^24.4.2` → `^25.0.0` | [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/psf/black/badge)](https://securityscorecards.dev/viewer/?uri=github.com/psf/black) | --- ### Release Notes <details> <summary>psf/black (black)</summary> ### [`v25.12.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#25120) [Compare Source](psf/black@25.11.0...25.12.0) ##### Highlights - Black no longer supports running with Python 3.9 ([#4842](psf/black#4842)) ##### Stable style - Fix bug where comments preceding `# fmt: off`/`# fmt: on` blocks were incorrectly removed, particularly affecting Jupytext's `# %% [markdown]` comments ([#4845](psf/black#4845)) - Fix crash when multiple `# fmt: skip` comments are used in a multi-part if-clause, on string literals, or on dictionary entries with long lines ([#4872](psf/black#4872)) - Fix possible crash when `fmt: ` directives aren't on the top level ([#4856](psf/black#4856)) ##### Preview style - Fix `fmt: skip` skipping the line after instead of the line it's on ([#4855](psf/black#4855)) - Remove unnecessary parentheses from the left-hand side of assignments while preserving magic trailing commas and intentional multiline formatting ([#4865](psf/black#4865)) - Fix `fix_fmt_skip_in_one_liners` crashing on `with` statements ([#4853](psf/black#4853)) - Fix `fix_fmt_skip_in_one_liners` crashing on annotated parameters ([#4854](psf/black#4854)) - Fix new lines being added after imports with `# fmt: skip` on them ([#4894](psf/black#4894)) ##### Packaging - Releases now include arm64 Windows binaries and wheels ([#4814](psf/black#4814)) ##### Integrations - Add `output-file` input to GitHub Action `psf/black` to write formatter output to a file for artifact capture and log cleanliness ([#4824](psf/black#4824)) ### [`v25.11.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#25110) [Compare Source](psf/black@25.9.0...25.11.0) ##### Highlights - Enable base 3.14 support ([#4804](psf/black#4804)) - Add support for the new Python 3.14 t-string syntax introduced by PEP 750 ([#4805](psf/black#4805)) ##### Stable style - Fix bug where comments between `# fmt: off` and `# fmt: on` were reformatted ([#4811](psf/black#4811)) - Comments containing fmt directives now preserve their exact formatting instead of being normalized ([#4811](psf/black#4811)) ##### Preview style - Move `multiline_string_handling` from `--unstable` to `--preview` ([#4760](psf/black#4760)) - Fix bug where module docstrings would be treated as normal strings if preceded by comments ([#4764](psf/black#4764)) - Fix bug where python 3.12 generics syntax split line happens weirdly ([#4777](psf/black#4777)) - Standardize type comments to form `# type: <value>` ([#4645](psf/black#4645)) - Fix `fix_fmt_skip_in_one_liners` preview feature to respect `# fmt: skip` for compound statements with semicolon-separated bodies ([#4800](psf/black#4800)) ##### Configuration - Add `no_cache` option to control caching behavior. ([#4803](psf/black#4803)) ##### Packaging - Releases now include arm64 Linux binaries ([#4773](psf/black#4773)) ##### Output - Write unchanged content to stdout when excluding formatting from stdin using pipes ([#4610](psf/black#4610)) ##### *Blackd* - Implemented BlackDClient. This simple python client allows to easily send formatting requests to blackd ([#4774](psf/black#4774)) ##### Integrations - Enable 3.14 base CI ([#4804](psf/black#4804)) - Enhance GitHub Action `psf/black` to support the `required-version` major-version-only "stability" format when using pyproject.toml ([#4770](psf/black#4770)) - Improve error message for vim plugin users. It now handles independently vim version - Vim: Warn on unsupported Vim and Python versions independently ([#4772](psf/black#4772)) - Vim: Print the import paths when importing black fails ([#4675](psf/black#4675)) - Vim: Fix handling of virtualenvs that have a different Python version ([#4675](psf/black#4675)) ### [`v25.9.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#2590) [Compare Source](psf/black@25.1.0...25.9.0) ##### Highlights - Remove support for pre-python 3.7 `await/async` as soft keywords/variable names ([#4676](psf/black#4676)) ##### Stable style - Fix crash while formatting a long `del` statement containing tuples ([#4628](psf/black#4628)) - Fix crash while formatting expressions using the walrus operator in complex `with` statements ([#4630](psf/black#4630)) - Handle `# fmt: skip` followed by a comment at the end of file ([#4635](psf/black#4635)) - Fix crash when a tuple appears in the `as` clause of a `with` statement ([#4634](psf/black#4634)) - Fix crash when tuple is used as a context manager inside a `with` statement ([#4646](psf/black#4646)) - Fix crash when formatting a `\` followed by a `\r` followed by a comment ([#4663](psf/black#4663)) - Fix crash on a `\\r\n` ([#4673](psf/black#4673)) - Fix crash on `await ...` (where `...` is a literal `Ellipsis`) ([#4676](psf/black#4676)) - Fix crash on parenthesized expression inside a type parameter bound ([#4684](psf/black#4684)) - Fix crash when using line ranges excluding indented single line decorated items ([#4670](psf/black#4670)) ##### Preview style - Fix a bug where one-liner functions/conditionals marked with `# fmt: skip` would still be formatted ([#4552](psf/black#4552)) - Improve `multiline_string_handling` with ternaries and dictionaries ([#4657](psf/black#4657)) - Fix a bug where `string_processing` would not split f-strings directly after expressions ([#4680](psf/black#4680)) - Wrap the `in` clause of comprehensions across lines if necessary ([#4699](psf/black#4699)) - Remove parentheses around multiple exception types in `except` and `except*` without `as`. ([#4720](psf/black#4720)) - Add `\r` style newlines to the potential newlines to normalize file newlines both from and to ([#4710](psf/black#4710)) ##### Parser - Rewrite tokenizer to improve performance and compliance ([#4536](psf/black#4536)) - Fix bug where certain unusual expressions (e.g., lambdas) were not accepted in type parameter bounds and defaults. ([#4602](psf/black#4602)) ##### Performance - Avoid using an extra process when running with only one worker ([#4734](psf/black#4734)) ##### Integrations - Fix the version check in the vim file to reject Python 3.8 ([#4567](psf/black#4567)) - Enhance GitHub Action `psf/black` to read Black version from an additional section in pyproject.toml: `[project.dependency-groups]` ([#4606](psf/black#4606)) - Build gallery docker image with python3-slim and reduce image size ([#4686](psf/black#4686)) ##### Documentation - Add FAQ entry for windows emoji not displaying ([#4714](psf/black#4714)) ### [`v25.1.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#2510) [Compare Source](psf/black@24.10.0...25.1.0) ##### Highlights This release introduces the new 2025 stable style ([#4558](psf/black#4558)), stabilizing the following changes: - Normalize casing of Unicode escape characters in strings to lowercase ([#2916](psf/black#2916)) - Fix inconsistencies in whether certain strings are detected as docstrings ([#4095](psf/black#4095)) - Consistently add trailing commas to typed function parameters ([#4164](psf/black#4164)) - Remove redundant parentheses in if guards for case blocks ([#4214](psf/black#4214)) - Add parentheses to if clauses in case blocks when the line is too long ([#4269](psf/black#4269)) - Whitespace before `# fmt: skip` comments is no longer normalized ([#4146](psf/black#4146)) - Fix line length computation for certain expressions that involve the power operator ([#4154](psf/black#4154)) - Check if there is a newline before the terminating quotes of a docstring ([#4185](psf/black#4185)) - Fix type annotation spacing between `*` and more complex type variable tuple ([#4440](psf/black#4440)) The following changes were not in any previous release: - Remove parentheses around sole list items ([#4312](psf/black#4312)) - Generic function definitions are now formatted more elegantly: parameters are split over multiple lines first instead of type parameter definitions ([#4553](psf/black#4553)) ##### Stable style - Fix formatting cells in IPython notebooks with magic methods and starting or trailing empty lines ([#4484](psf/black#4484)) - Fix crash when formatting `with` statements containing tuple generators/unpacking ([#4538](psf/black#4538)) ##### Preview style - Fix/remove string merging changing f-string quotes on f-strings with internal quotes ([#4498](psf/black#4498)) - Collapse multiple empty lines after an import into one ([#4489](psf/black#4489)) - Prevent `string_processing` and `wrap_long_dict_values_in_parens` from removing parentheses around long dictionary values ([#4377](psf/black#4377)) - Move `wrap_long_dict_values_in_parens` from the unstable to preview style ([#4561](psf/black#4561)) ##### Packaging - Store license identifier inside the `License-Expression` metadata field, see [PEP 639](https://peps.python.org/pep-0639/). ([#4479](psf/black#4479)) ##### Performance - Speed up the `is_fstring_start` function in Black's tokenizer ([#4541](psf/black#4541)) ##### Integrations - If using stdin with `--stdin-filename` set to a force excluded path, stdin won't be formatted. ([#4539](psf/black#4539)) ### [`v24.10.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#24100) [Compare Source](psf/black@24.8.0...24.10.0) ##### Highlights - Black is now officially tested with Python 3.13 and provides Python 3.13 mypyc-compiled wheels. ([#4436](psf/black#4436)) ([#4449](psf/black#4449)) - Black will issue an error when used with Python 3.12.5, due to an upstream memory safety issue in Python 3.12.5 that can cause Black's AST safety checks to fail. Please use Python 3.12.6 or Python 3.12.4 instead. ([#4447](psf/black#4447)) - Black no longer supports running with Python 3.8 ([#4452](psf/black#4452)) ##### Stable style - Fix crashes involving comments in parenthesised return types or `X | Y` style unions. ([#4453](psf/black#4453)) - Fix skipping Jupyter cells with unknown `%%` magic ([#4462](psf/black#4462)) ##### Preview style - Fix type annotation spacing between \* and more complex type variable tuple (i.e. `def fn(*args: *tuple[*Ts, T]) -> None: pass`) ([#4440](psf/black#4440)) ##### Caching - Fix bug where the cache was shared between runs with and without `--unstable` ([#4466](psf/black#4466)) ##### Packaging - Upgrade version of mypyc used to 1.12 beta ([#4450](psf/black#4450)) ([#4449](psf/black#4449)) - `blackd` now requires a newer version of aiohttp. ([#4451](psf/black#4451)) ##### Output - Added Python target version information on parse error ([#4378](psf/black#4378)) - Add information about Black version to internal error messages ([#4457](psf/black#4457)) ### [`v24.8.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#2480) [Compare Source](psf/black@24.4.2...24.8.0) ##### Stable style - Fix crash when `# fmt: off` is used before a closing parenthesis or bracket. ([#4363](psf/black#4363)) ##### Packaging - Packaging metadata updated: docs are explictly linked, the issue tracker is now also linked. This improves the PyPI listing for Black. ([#4345](psf/black#4345)) ##### Parser - Fix regression where Black failed to parse a multiline f-string containing another multiline string ([#4339](psf/black#4339)) - Fix regression where Black failed to parse an escaped single quote inside an f-string ([#4401](psf/black#4401)) - Fix bug with Black incorrectly parsing empty lines with a backslash ([#4343](psf/black#4343)) - Fix bugs with Black's tokenizer not handling `\{` inside f-strings very well ([#4422](psf/black#4422)) - Fix incorrect line numbers in the tokenizer for certain tokens within f-strings ([#4423](psf/black#4423)) ##### Performance - Improve performance when a large directory is listed in `.gitignore` ([#4415](psf/black#4415)) ##### *Blackd* - Fix blackd (and all extras installs) for docker container ([#4357](psf/black#4357)) </details> --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  See merge request swiss-armed-forces/cyber-command/cea/loom!235 Co-authored-by: shrewd-laidback palace <shrewd-laidback-palace-736-c41-2c1-e464fc974@swiss-armed-forces-open-source.ch> Co-authored-by: Loom MR Pipeline Trigger <group_103951964_bot_9504bb8dead6d4e406ad817a607f24be@noreply.gitlab.com>

chore(deps): update black (major) This MR contains the following updates: | Package | Type | Update | Change | OpenSSF | |---|---|---|---|---| | [black](https://github.com/psf/black) ([changelog](https://github.com/psf/black/blob/main/CHANGES.md)) | dev | major | `^24.4.2` → `^25.0.0` | [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/psf/black/badge)](https://securityscorecards.dev/viewer/?uri=github.com/psf/black) | --- ### Release Notes <details> <summary>psf/black (black)</summary> ### [`v25.12.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#25120) [Compare Source](psf/black@25.11.0...25.12.0) ##### Highlights - Black no longer supports running with Python 3.9 ([#4842](psf/black#4842)) ##### Stable style - Fix bug where comments preceding `# fmt: off`/`# fmt: on` blocks were incorrectly removed, particularly affecting Jupytext's `# %% [markdown]` comments ([#4845](psf/black#4845)) - Fix crash when multiple `# fmt: skip` comments are used in a multi-part if-clause, on string literals, or on dictionary entries with long lines ([#4872](psf/black#4872)) - Fix possible crash when `fmt: ` directives aren't on the top level ([#4856](psf/black#4856)) ##### Preview style - Fix `fmt: skip` skipping the line after instead of the line it's on ([#4855](psf/black#4855)) - Remove unnecessary parentheses from the left-hand side of assignments while preserving magic trailing commas and intentional multiline formatting ([#4865](psf/black#4865)) - Fix `fix_fmt_skip_in_one_liners` crashing on `with` statements ([#4853](psf/black#4853)) - Fix `fix_fmt_skip_in_one_liners` crashing on annotated parameters ([#4854](psf/black#4854)) - Fix new lines being added after imports with `# fmt: skip` on them ([#4894](psf/black#4894)) ##### Packaging - Releases now include arm64 Windows binaries and wheels ([#4814](psf/black#4814)) ##### Integrations - Add `output-file` input to GitHub Action `psf/black` to write formatter output to a file for artifact capture and log cleanliness ([#4824](psf/black#4824)) ### [`v25.11.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#25110) [Compare Source](psf/black@25.9.0...25.11.0) ##### Highlights - Enable base 3.14 support ([#4804](psf/black#4804)) - Add support for the new Python 3.14 t-string syntax introduced by PEP 750 ([#4805](psf/black#4805)) ##### Stable style - Fix bug where comments between `# fmt: off` and `# fmt: on` were reformatted ([#4811](psf/black#4811)) - Comments containing fmt directives now preserve their exact formatting instead of being normalized ([#4811](psf/black#4811)) ##### Preview style - Move `multiline_string_handling` from `--unstable` to `--preview` ([#4760](psf/black#4760)) - Fix bug where module docstrings would be treated as normal strings if preceded by comments ([#4764](psf/black#4764)) - Fix bug where python 3.12 generics syntax split line happens weirdly ([#4777](psf/black#4777)) - Standardize type comments to form `# type: <value>` ([#4645](psf/black#4645)) - Fix `fix_fmt_skip_in_one_liners` preview feature to respect `# fmt: skip` for compound statements with semicolon-separated bodies ([#4800](psf/black#4800)) ##### Configuration - Add `no_cache` option to control caching behavior. ([#4803](psf/black#4803)) ##### Packaging - Releases now include arm64 Linux binaries ([#4773](psf/black#4773)) ##### Output - Write unchanged content to stdout when excluding formatting from stdin using pipes ([#4610](psf/black#4610)) ##### *Blackd* - Implemented BlackDClient. This simple python client allows to easily send formatting requests to blackd ([#4774](psf/black#4774)) ##### Integrations - Enable 3.14 base CI ([#4804](psf/black#4804)) - Enhance GitHub Action `psf/black` to support the `required-version` major-version-only "stability" format when using pyproject.toml ([#4770](psf/black#4770)) - Improve error message for vim plugin users. It now handles independently vim version - Vim: Warn on unsupported Vim and Python versions independently ([#4772](psf/black#4772)) - Vim: Print the import paths when importing black fails ([#4675](psf/black#4675)) - Vim: Fix handling of virtualenvs that have a different Python version ([#4675](psf/black#4675)) ### [`v25.9.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#2590) [Compare Source](psf/black@25.1.0...25.9.0) ##### Highlights - Remove support for pre-python 3.7 `await/async` as soft keywords/variable names ([#4676](psf/black#4676)) ##### Stable style - Fix crash while formatting a long `del` statement containing tuples ([#4628](psf/black#4628)) - Fix crash while formatting expressions using the walrus operator in complex `with` statements ([#4630](psf/black#4630)) - Handle `# fmt: skip` followed by a comment at the end of file ([#4635](psf/black#4635)) - Fix crash when a tuple appears in the `as` clause of a `with` statement ([#4634](psf/black#4634)) - Fix crash when tuple is used as a context manager inside a `with` statement ([#4646](psf/black#4646)) - Fix crash when formatting a `\` followed by a `\r` followed by a comment ([#4663](psf/black#4663)) - Fix crash on a `\\r\n` ([#4673](psf/black#4673)) - Fix crash on `await ...` (where `...` is a literal `Ellipsis`) ([#4676](psf/black#4676)) - Fix crash on parenthesized expression inside a type parameter bound ([#4684](psf/black#4684)) - Fix crash when using line ranges excluding indented single line decorated items ([#4670](psf/black#4670)) ##### Preview style - Fix a bug where one-liner functions/conditionals marked with `# fmt: skip` would still be formatted ([#4552](psf/black#4552)) - Improve `multiline_string_handling` with ternaries and dictionaries ([#4657](psf/black#4657)) - Fix a bug where `string_processing` would not split f-strings directly after expressions ([#4680](psf/black#4680)) - Wrap the `in` clause of comprehensions across lines if necessary ([#4699](psf/black#4699)) - Remove parentheses around multiple exception types in `except` and `except*` without `as`. ([#4720](psf/black#4720)) - Add `\r` style newlines to the potential newlines to normalize file newlines both from and to ([#4710](psf/black#4710)) ##### Parser - Rewrite tokenizer to improve performance and compliance ([#4536](psf/black#4536)) - Fix bug where certain unusual expressions (e.g., lambdas) were not accepted in type parameter bounds and defaults. ([#4602](psf/black#4602)) ##### Performance - Avoid using an extra process when running with only one worker ([#4734](psf/black#4734)) ##### Integrations - Fix the version check in the vim file to reject Python 3.8 ([#4567](psf/black#4567)) - Enhance GitHub Action `psf/black` to read Black version from an additional section in pyproject.toml: `[project.dependency-groups]` ([#4606](psf/black#4606)) - Build gallery docker image with python3-slim and reduce image size ([#4686](psf/black#4686)) ##### Documentation - Add FAQ entry for windows emoji not displaying ([#4714](psf/black#4714)) ### [`v25.1.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#2510) [Compare Source](psf/black@24.10.0...25.1.0) ##### Highlights This release introduces the new 2025 stable style ([#4558](psf/black#4558)), stabilizing the following changes: - Normalize casing of Unicode escape characters in strings to lowercase ([#2916](psf/black#2916)) - Fix inconsistencies in whether certain strings are detected as docstrings ([#4095](psf/black#4095)) - Consistently add trailing commas to typed function parameters ([#4164](psf/black#4164)) - Remove redundant parentheses in if guards for case blocks ([#4214](psf/black#4214)) - Add parentheses to if clauses in case blocks when the line is too long ([#4269](psf/black#4269)) - Whitespace before `# fmt: skip` comments is no longer normalized ([#4146](psf/black#4146)) - Fix line length computation for certain expressions that involve the power operator ([#4154](psf/black#4154)) - Check if there is a newline before the terminating quotes of a docstring ([#4185](psf/black#4185)) - Fix type annotation spacing between `*` and more complex type variable tuple ([#4440](psf/black#4440)) The following changes were not in any previous release: - Remove parentheses around sole list items ([#4312](psf/black#4312)) - Generic function definitions are now formatted more elegantly: parameters are split over multiple lines first instead of type parameter definitions ([#4553](psf/black#4553)) ##### Stable style - Fix formatting cells in IPython notebooks with magic methods and starting or trailing empty lines ([#4484](psf/black#4484)) - Fix crash when formatting `with` statements containing tuple generators/unpacking ([#4538](psf/black#4538)) ##### Preview style - Fix/remove string merging changing f-string quotes on f-strings with internal quotes ([#4498](psf/black#4498)) - Collapse multiple empty lines after an import into one ([#4489](psf/black#4489)) - Prevent `string_processing` and `wrap_long_dict_values_in_parens` from removing parentheses around long dictionary values ([#4377](psf/black#4377)) - Move `wrap_long_dict_values_in_parens` from the unstable to preview style ([#4561](psf/black#4561)) ##### Packaging - Store license identifier inside the `License-Expression` metadata field, see [PEP 639](https://peps.python.org/pep-0639/). ([#4479](psf/black#4479)) ##### Performance - Speed up the `is_fstring_start` function in Black's tokenizer ([#4541](psf/black#4541)) ##### Integrations - If using stdin with `--stdin-filename` set to a force excluded path, stdin won't be formatted. ([#4539](psf/black#4539)) ### [`v24.10.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#24100) [Compare Source](psf/black@24.8.0...24.10.0) ##### Highlights - Black is now officially tested with Python 3.13 and provides Python 3.13 mypyc-compiled wheels. ([#4436](psf/black#4436)) ([#4449](psf/black#4449)) - Black will issue an error when used with Python 3.12.5, due to an upstream memory safety issue in Python 3.12.5 that can cause Black's AST safety checks to fail. Please use Python 3.12.6 or Python 3.12.4 instead. ([#4447](psf/black#4447)) - Black no longer supports running with Python 3.8 ([#4452](psf/black#4452)) ##### Stable style - Fix crashes involving comments in parenthesised return types or `X | Y` style unions. ([#4453](psf/black#4453)) - Fix skipping Jupyter cells with unknown `%%` magic ([#4462](psf/black#4462)) ##### Preview style - Fix type annotation spacing between \* and more complex type variable tuple (i.e. `def fn(*args: *tuple[*Ts, T]) -> None: pass`) ([#4440](psf/black#4440)) ##### Caching - Fix bug where the cache was shared between runs with and without `--unstable` ([#4466](psf/black#4466)) ##### Packaging - Upgrade version of mypyc used to 1.12 beta ([#4450](psf/black#4450)) ([#4449](psf/black#4449)) - `blackd` now requires a newer version of aiohttp. ([#4451](psf/black#4451)) ##### Output - Added Python target version information on parse error ([#4378](psf/black#4378)) - Add information about Black version to internal error messages ([#4457](psf/black#4457)) ### [`v24.8.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#2480) [Compare Source](psf/black@24.4.2...24.8.0) ##### Stable style - Fix crash when `# fmt: off` is used before a closing parenthesis or bracket. ([#4363](psf/black#4363)) ##### Packaging - Packaging metadata updated: docs are explictly linked, the issue tracker is now also linked. This improves the PyPI listing for Black. ([#4345](psf/black#4345)) ##### Parser - Fix regression where Black failed to parse a multiline f-string containing another multiline string ([#4339](psf/black#4339)) - Fix regression where Black failed to parse an escaped single quote inside an f-string ([#4401](psf/black#4401)) - Fix bug with Black incorrectly parsing empty lines with a backslash ([#4343](psf/black#4343)) - Fix bugs with Black's tokenizer not handling `\{` inside f-strings very well ([#4422](psf/black#4422)) - Fix incorrect line numbers in the tokenizer for certain tokens within f-strings ([#4423](psf/black#4423)) ##### Performance - Improve performance when a large directory is listed in `.gitignore` ([#4415](psf/black#4415)) ##### *Blackd* - Fix blackd (and all extras installs) for docker container ([#4357](psf/black#4357)) </details> --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  See merge request swiss-armed-forces/cyber-command/cea/loom!235 Co-authored-by: Loom MR Pipeline Trigger <group_103951964_bot_9504bb8dead6d4e406ad817a607f24be@noreply.gitlab.com> Co-authored-by: open-source Pipeline <group_90701827_bot_ed04ae348bc5f40af9966fb8b6867e99@noreply.gitlab.com>

This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [black](https://github.com/psf/black) ([changelog](https://github.com/psf/black/blob/main/CHANGES.md)) | `<25.2.0,>=25.1.0` -> `<25.9.1,>=25.9.0` | [![age](https://developer.mend.io/api/mc/badges/age/pypi/black/25.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/black/25.1.0/25.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>psf/black (black)</summary> ### [`v25.9.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#2590) [Compare Source](psf/black@25.1.0...25.9.0) ##### Highlights - Remove support for pre-python 3.7 `await/async` as soft keywords/variable names ([#4676](psf/black#4676)) ##### Stable style - Fix crash while formatting a long `del` statement containing tuples ([#4628](psf/black#4628)) - Fix crash while formatting expressions using the walrus operator in complex `with` statements ([#4630](psf/black#4630)) - Handle `# fmt: skip` followed by a comment at the end of file ([#4635](psf/black#4635)) - Fix crash when a tuple appears in the `as` clause of a `with` statement ([#4634](psf/black#4634)) - Fix crash when tuple is used as a context manager inside a `with` statement ([#4646](psf/black#4646)) - Fix crash when formatting a `\` followed by a `\r` followed by a comment ([#4663](psf/black#4663)) - Fix crash on a `\\r\n` ([#4673](psf/black#4673)) - Fix crash on `await ...` (where `...` is a literal `Ellipsis`) ([#4676](psf/black#4676)) - Fix crash on parenthesized expression inside a type parameter bound ([#4684](psf/black#4684)) - Fix crash when using line ranges excluding indented single line decorated items ([#4670](psf/black#4670)) ##### Preview style - Fix a bug where one-liner functions/conditionals marked with `# fmt: skip` would still be formatted ([#4552](psf/black#4552)) - Improve `multiline_string_handling` with ternaries and dictionaries ([#4657](psf/black#4657)) - Fix a bug where `string_processing` would not split f-strings directly after expressions ([#4680](psf/black#4680)) - Wrap the `in` clause of comprehensions across lines if necessary ([#4699](psf/black#4699)) - Remove parentheses around multiple exception types in `except` and `except*` without `as`. ([#4720](psf/black#4720)) - Add `\r` style newlines to the potential newlines to normalize file newlines both from and to ([#4710](psf/black#4710)) ##### Parser - Rewrite tokenizer to improve performance and compliance ([#4536](psf/black#4536)) - Fix bug where certain unusual expressions (e.g., lambdas) were not accepted in type parameter bounds and defaults. ([#4602](psf/black#4602)) ##### Performance - Avoid using an extra process when running with only one worker ([#4734](psf/black#4734)) ##### Integrations - Fix the version check in the vim file to reject Python 3.8 ([#4567](psf/black#4567)) - Enhance GitHub Action `psf/black` to read Black version from an additional section in pyproject.toml: `[project.dependency-groups]` ([#4606](psf/black#4606)) - Build gallery docker image with python3-slim and reduce image size ([#4686](psf/black#4686)) ##### Documentation - Add FAQ entry for windows emoji not displaying ([#4714](psf/black#4714)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://git.tainton.uk/repos/webexmemebot/pulls/506 Co-authored-by: Renovate [BOT] <renovate-bot@git.tainton.uk> Co-committed-by: Renovate [BOT] <renovate-bot@git.tainton.uk>

This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [black](https://github.com/psf/black) ([changelog](https://github.com/psf/black/blob/main/CHANGES.md)) | `<25.2.0,>=25.1.0` -> `<25.9.1,>=25.9.0` | [![age](https://developer.mend.io/api/mc/badges/age/pypi/black/25.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/black/25.1.0/25.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>psf/black (black)</summary> ### [`v25.9.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#2590) [Compare Source](psf/black@25.1.0...25.9.0) ##### Highlights - Remove support for pre-python 3.7 `await/async` as soft keywords/variable names ([#4676](psf/black#4676)) ##### Stable style - Fix crash while formatting a long `del` statement containing tuples ([#4628](psf/black#4628)) - Fix crash while formatting expressions using the walrus operator in complex `with` statements ([#4630](psf/black#4630)) - Handle `# fmt: skip` followed by a comment at the end of file ([#4635](psf/black#4635)) - Fix crash when a tuple appears in the `as` clause of a `with` statement ([#4634](psf/black#4634)) - Fix crash when tuple is used as a context manager inside a `with` statement ([#4646](psf/black#4646)) - Fix crash when formatting a `\` followed by a `\r` followed by a comment ([#4663](psf/black#4663)) - Fix crash on a `\\r\n` ([#4673](psf/black#4673)) - Fix crash on `await ...` (where `...` is a literal `Ellipsis`) ([#4676](psf/black#4676)) - Fix crash on parenthesized expression inside a type parameter bound ([#4684](psf/black#4684)) - Fix crash when using line ranges excluding indented single line decorated items ([#4670](psf/black#4670)) ##### Preview style - Fix a bug where one-liner functions/conditionals marked with `# fmt: skip` would still be formatted ([#4552](psf/black#4552)) - Improve `multiline_string_handling` with ternaries and dictionaries ([#4657](psf/black#4657)) - Fix a bug where `string_processing` would not split f-strings directly after expressions ([#4680](psf/black#4680)) - Wrap the `in` clause of comprehensions across lines if necessary ([#4699](psf/black#4699)) - Remove parentheses around multiple exception types in `except` and `except*` without `as`. ([#4720](psf/black#4720)) - Add `\r` style newlines to the potential newlines to normalize file newlines both from and to ([#4710](psf/black#4710)) ##### Parser - Rewrite tokenizer to improve performance and compliance ([#4536](psf/black#4536)) - Fix bug where certain unusual expressions (e.g., lambdas) were not accepted in type parameter bounds and defaults. ([#4602](psf/black#4602)) ##### Performance - Avoid using an extra process when running with only one worker ([#4734](psf/black#4734)) ##### Integrations - Fix the version check in the vim file to reject Python 3.8 ([#4567](psf/black#4567)) - Enhance GitHub Action `psf/black` to read Black version from an additional section in pyproject.toml: `[project.dependency-groups]` ([#4606](psf/black#4606)) - Build gallery docker image with python3-slim and reduce image size ([#4686](psf/black#4686)) ##### Documentation - Add FAQ entry for windows emoji not displaying ([#4714](psf/black#4714)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://git.tainton.uk/luke/instant-msg-api/pulls/208 Co-authored-by: Renovate [BOT] <renovate-bot@git.tainton.uk> Co-committed-by: Renovate [BOT] <renovate-bot@git.tainton.uk>

This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [black](https://github.com/psf/black) ([changelog](https://github.com/psf/black/blob/main/CHANGES.md)) | `<25.2.0,>=25.1.0` -> `<25.9.1,>=25.9.0` | [![age](https://developer.mend.io/api/mc/badges/age/pypi/black/25.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/black/25.1.0/25.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>psf/black (black)</summary> ### [`v25.9.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#2590) [Compare Source](psf/black@25.1.0...25.9.0) ##### Highlights - Remove support for pre-python 3.7 `await/async` as soft keywords/variable names ([#4676](psf/black#4676)) ##### Stable style - Fix crash while formatting a long `del` statement containing tuples ([#4628](psf/black#4628)) - Fix crash while formatting expressions using the walrus operator in complex `with` statements ([#4630](psf/black#4630)) - Handle `# fmt: skip` followed by a comment at the end of file ([#4635](psf/black#4635)) - Fix crash when a tuple appears in the `as` clause of a `with` statement ([#4634](psf/black#4634)) - Fix crash when tuple is used as a context manager inside a `with` statement ([#4646](psf/black#4646)) - Fix crash when formatting a `\` followed by a `\r` followed by a comment ([#4663](psf/black#4663)) - Fix crash on a `\\r\n` ([#4673](psf/black#4673)) - Fix crash on `await ...` (where `...` is a literal `Ellipsis`) ([#4676](psf/black#4676)) - Fix crash on parenthesized expression inside a type parameter bound ([#4684](psf/black#4684)) - Fix crash when using line ranges excluding indented single line decorated items ([#4670](psf/black#4670)) ##### Preview style - Fix a bug where one-liner functions/conditionals marked with `# fmt: skip` would still be formatted ([#4552](psf/black#4552)) - Improve `multiline_string_handling` with ternaries and dictionaries ([#4657](psf/black#4657)) - Fix a bug where `string_processing` would not split f-strings directly after expressions ([#4680](psf/black#4680)) - Wrap the `in` clause of comprehensions across lines if necessary ([#4699](psf/black#4699)) - Remove parentheses around multiple exception types in `except` and `except*` without `as`. ([#4720](psf/black#4720)) - Add `\r` style newlines to the potential newlines to normalize file newlines both from and to ([#4710](psf/black#4710)) ##### Parser - Rewrite tokenizer to improve performance and compliance ([#4536](psf/black#4536)) - Fix bug where certain unusual expressions (e.g., lambdas) were not accepted in type parameter bounds and defaults. ([#4602](psf/black#4602)) ##### Performance - Avoid using an extra process when running with only one worker ([#4734](psf/black#4734)) ##### Integrations - Fix the version check in the vim file to reject Python 3.8 ([#4567](psf/black#4567)) - Enhance GitHub Action `psf/black` to read Black version from an additional section in pyproject.toml: `[project.dependency-groups]` ([#4606](psf/black#4606)) - Build gallery docker image with python3-slim and reduce image size ([#4686](psf/black#4686)) ##### Documentation - Add FAQ entry for windows emoji not displaying ([#4714](psf/black#4714)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://git.tainton.uk/repos/pypilot/pulls/374 Co-authored-by: Renovate [BOT] <renovate-bot@git.tainton.uk> Co-committed-by: Renovate [BOT] <renovate-bot@git.tainton.uk>

This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [black](https://github.com/psf/black) ([changelog](https://github.com/psf/black/blob/main/CHANGES.md)) | `<25.2.0,>=25.1.0` -> `<25.9.1,>=25.9.0` | [![age](https://developer.mend.io/api/mc/badges/age/pypi/black/25.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/black/25.1.0/25.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>psf/black (black)</summary> ### [`v25.9.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#2590) [Compare Source](psf/black@25.1.0...25.9.0) ##### Highlights - Remove support for pre-python 3.7 `await/async` as soft keywords/variable names ([#4676](psf/black#4676)) ##### Stable style - Fix crash while formatting a long `del` statement containing tuples ([#4628](psf/black#4628)) - Fix crash while formatting expressions using the walrus operator in complex `with` statements ([#4630](psf/black#4630)) - Handle `# fmt: skip` followed by a comment at the end of file ([#4635](psf/black#4635)) - Fix crash when a tuple appears in the `as` clause of a `with` statement ([#4634](psf/black#4634)) - Fix crash when tuple is used as a context manager inside a `with` statement ([#4646](psf/black#4646)) - Fix crash when formatting a `\` followed by a `\r` followed by a comment ([#4663](psf/black#4663)) - Fix crash on a `\\r\n` ([#4673](psf/black#4673)) - Fix crash on `await ...` (where `...` is a literal `Ellipsis`) ([#4676](psf/black#4676)) - Fix crash on parenthesized expression inside a type parameter bound ([#4684](psf/black#4684)) - Fix crash when using line ranges excluding indented single line decorated items ([#4670](psf/black#4670)) ##### Preview style - Fix a bug where one-liner functions/conditionals marked with `# fmt: skip` would still be formatted ([#4552](psf/black#4552)) - Improve `multiline_string_handling` with ternaries and dictionaries ([#4657](psf/black#4657)) - Fix a bug where `string_processing` would not split f-strings directly after expressions ([#4680](psf/black#4680)) - Wrap the `in` clause of comprehensions across lines if necessary ([#4699](psf/black#4699)) - Remove parentheses around multiple exception types in `except` and `except*` without `as`. ([#4720](psf/black#4720)) - Add `\r` style newlines to the potential newlines to normalize file newlines both from and to ([#4710](psf/black#4710)) ##### Parser - Rewrite tokenizer to improve performance and compliance ([#4536](psf/black#4536)) - Fix bug where certain unusual expressions (e.g., lambdas) were not accepted in type parameter bounds and defaults. ([#4602](psf/black#4602)) ##### Performance - Avoid using an extra process when running with only one worker ([#4734](psf/black#4734)) ##### Integrations - Fix the version check in the vim file to reject Python 3.8 ([#4567](psf/black#4567)) - Enhance GitHub Action `psf/black` to read Black version from an additional section in pyproject.toml: `[project.dependency-groups]` ([#4606](psf/black#4606)) - Build gallery docker image with python3-slim and reduce image size ([#4686](psf/black#4686)) ##### Documentation - Add FAQ entry for windows emoji not displaying ([#4714](psf/black#4714)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://git.tainton.uk/repos/PwnedPW/pulls/296 Co-authored-by: Renovate [BOT] <renovate-bot@git.tainton.uk> Co-committed-by: Renovate [BOT] <renovate-bot@git.tainton.uk>

Pedro-Muller29 force-pushed the fix-fmt-skip-one-liner branch from a94a78c to 2433e85 Compare January 18, 2025 07:48

MeGaGiGaGon reviewed Jan 18, 2025

View reviewed changes

Pedro-Muller29 force-pushed the fix-fmt-skip-one-liner branch from 2433e85 to c37f259 Compare January 18, 2025 17:53

JelleZijlstra reviewed Jan 19, 2025

View reviewed changes

Pedro-Muller29 force-pushed the fix-fmt-skip-one-liner branch from c37f259 to ee282ae Compare January 20, 2025 13:11

JelleZijlstra self-requested a review January 20, 2025 20:29

Pedro-Muller29 added 2 commits February 6, 2025 09:39

Fix bug where # fmt: skip is not being respect with one-liner functio…

93954e8

…ns or conditionals (psf#4535) (psf#3682)

.

9332a5c

Pedro-Muller29 force-pushed the fix-fmt-skip-one-liner branch from 6fcadbd to 9332a5c Compare February 6, 2025 12:58

Merge branch 'main' into fix-fmt-skip-one-liner

fcab4b4

JelleZijlstra approved these changes Mar 3, 2025

View reviewed changes

JelleZijlstra merged commit 3e9dd25 into psf:main Mar 3, 2025
46 checks passed

dsmith111 pushed a commit to jwstanly/black that referenced this pull request May 15, 2025

Fix bug where # fmt: skip is not being respected with one-liner funct…

d25f33a

…ions (psf#4552)

dylwil3 mentioned this pull request Sep 19, 2025

Ruff 2026 Style Guide astral-sh/ruff#20482

Open

31 tasks

		@@ -0,0 +1 @@
		def foo(): return "mock" # fmt: skip No newline at end of file

Fix bug where # fmt: skip is not being respected with one-liner functions #4552

Fix bug where # fmt: skip is not being respected with one-liner functions #4552

Uh oh!

Conversation

Pedro-Muller29 commented Jan 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Previous Algorithm

New Algorithm

Checklist - did you ...

Uh oh!

Pedro-Muller29 commented Jan 18, 2025

Uh oh!

MeGaGiGaGon Jan 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Pedro-Muller29 Jan 18, 2025

Choose a reason for hiding this comment

Uh oh!

cobaltt7 commented Jan 18, 2025

Uh oh!

Pedro-Muller29 commented Jan 18, 2025

Uh oh!

JelleZijlstra commented Jan 19, 2025

Uh oh!

JelleZijlstra Jan 19, 2025

Choose a reason for hiding this comment

Uh oh!

Pedro-Muller29 Jan 20, 2025

Choose a reason for hiding this comment

Uh oh!

cobaltt7 commented Feb 6, 2025

Uh oh!

Pedro-Muller29 commented Feb 6, 2025

Uh oh!

Pedro-Muller29 commented Feb 6, 2025

Uh oh!

MeGaGiGaGon commented Feb 7, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Pedro-Muller29 commented Jan 18, 2025 •

edited

Loading

MeGaGiGaGon Jan 18, 2025 •

edited

Loading