Skip to content

Commit

Permalink
Merge #1451
Browse files Browse the repository at this point in the history
1451: Bump psf/black from 22.12.0 to 23.1.0 r=messense a=dependabot[bot]

Bumps [psf/black](https://github.com/psf/black) from 22.12.0 to 23.1.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/psf/black/releases">psf/black's releases</a>.</em></p>
<blockquote>
<h2>23.1.0</h2>
<h3>Highlights</h3>
<p>This is the first release of 2023, and following our <a href="https://black.readthedocs.io/en/stable/the_black_code_style/index.html#stability-policy">stability policy</a>, it comes with a number of improvements to our stable style, notably improvements to empty line handling and the removal of redundant parentheses in several contexts.</p>
<p>There are also many changes to the preview style; try out <code>black --preview</code> and give us feedback to help us set the stable style for next year.</p>
<p>In addition to style changes, Black now automatically infers the supported Python versions from your <code>pyproject.toml</code> file, removing the need to set Black's target versions separately.</p>
<h3>Stable style</h3>
<!-- raw HTML omitted -->
<ul>
<li>Introduce the 2023 stable style, which incorporates most aspects of last year's preview style (<a href="https://github-redirect.dependabot.com/psf/black/issues/3418">#3418</a>). Specific changes:
<ul>
<li>Enforce empty lines before classes and functions with sticky leading comments (<a href="https://github-redirect.dependabot.com/psf/black/issues/3302">#3302</a>) (22.12.0)</li>
<li>Reformat empty and whitespace-only files as either an empty file (if no newline is present) or as a single newline character (if a newline is present) (<a href="https://github-redirect.dependabot.com/psf/black/issues/3348">#3348</a>) (22.12.0)</li>
<li>Correctly handle trailing commas that are inside a line's leading non-nested parens (<a href="https://github-redirect.dependabot.com/psf/black/issues/3370">#3370</a>) (22.12.0)</li>
<li><code>--skip-string-normalization</code> / <code>-S</code> now prevents docstring prefixes from being normalized as expected (<a href="https://github-redirect.dependabot.com/psf/black/issues/3168">#3168</a>) (since 22.8.0)</li>
<li>When using <code>--skip-magic-trailing-comma</code> or <code>-C</code>, trailing commas are stripped from subscript expressions with more than 1 element (<a href="https://github-redirect.dependabot.com/psf/black/issues/3209">#3209</a>) (22.8.0)</li>
<li>Fix a string merging/split issue when a comment is present in the middle of implicitly concatenated strings on its own line (<a href="https://github-redirect.dependabot.com/psf/black/issues/3227">#3227</a>) (22.8.0)</li>
<li>Docstring quotes are no longer moved if it would violate the line length limit (<a href="https://github-redirect.dependabot.com/psf/black/issues/3044">#3044</a>, <a href="https://github-redirect.dependabot.com/psf/black/issues/3430">#3430</a>) (22.6.0)</li>
<li>Parentheses around return annotations are now managed (<a href="https://github-redirect.dependabot.com/psf/black/issues/2990">#2990</a>) (22.6.0)</li>
<li>Remove unnecessary parentheses around awaited objects (<a href="https://github-redirect.dependabot.com/psf/black/issues/2991">#2991</a>) (22.6.0)</li>
<li>Remove unnecessary parentheses in <code>with</code> statements (<a href="https://github-redirect.dependabot.com/psf/black/issues/2926">#2926</a>) (22.6.0)</li>
<li>Remove trailing newlines after code block open (<a href="https://github-redirect.dependabot.com/psf/black/issues/3035">#3035</a>) (22.6.0)</li>
<li>Code cell separators <code>#%%</code> are now standardised to <code># %%</code> (<a href="https://github-redirect.dependabot.com/psf/black/issues/2919">#2919</a>) (22.3.0)</li>
<li>Remove unnecessary parentheses from <code>except</code> statements (<a href="https://github-redirect.dependabot.com/psf/black/issues/2939">#2939</a>) (22.3.0)</li>
<li>Remove unnecessary parentheses from tuple unpacking in <code>for</code> loops (<a href="https://github-redirect.dependabot.com/psf/black/issues/2945">#2945</a>) (22.3.0)</li>
<li>Avoid magic-trailing-comma in single-element subscripts (<a href="https://github-redirect.dependabot.com/psf/black/issues/2942">#2942</a>) (22.3.0)</li>
</ul>
</li>
<li>Fix a crash when a colon line is marked between <code># fmt: off</code> and <code># fmt: on</code> (<a href="https://github-redirect.dependabot.com/psf/black/issues/3439">#3439</a>)</li>
</ul>
<h3>Preview style</h3>
<!-- raw HTML omitted -->
<ul>
<li>Format hex codes in unicode escape sequences in string literals (<a href="https://github-redirect.dependabot.com/psf/black/issues/2916">#2916</a>)</li>
<li>Add parentheses around <code>if</code>-<code>else</code> expressions (<a href="https://github-redirect.dependabot.com/psf/black/issues/2278">#2278</a>)</li>
<li>Improve performance on large expressions that contain many strings (<a href="https://github-redirect.dependabot.com/psf/black/issues/3467">#3467</a>)</li>
<li>Fix a crash in preview style with assert + parenthesized string (<a href="https://github-redirect.dependabot.com/psf/black/issues/3415">#3415</a>)</li>
<li>Fix crashes in preview style with walrus operators used in function return annotations and except clauses (<a href="https://github-redirect.dependabot.com/psf/black/issues/3423">#3423</a>)</li>
<li>Fix a crash in preview advanced string processing where mixed implicitly concatenated regular and f-strings start with an empty span (<a href="https://github-redirect.dependabot.com/psf/black/issues/3463">#3463</a>)</li>
<li>Fix a crash in preview advanced string processing where a standalone comment is placed before a dict's value (<a href="https://github-redirect.dependabot.com/psf/black/issues/3469">#3469</a>)</li>
<li>Fix an issue where extra empty lines are added when a decorator has <code># fmt: skip</code> applied or there is a standalone comment between decorators (<a href="https://github-redirect.dependabot.com/psf/black/issues/3470">#3470</a>)</li>
<li>Do not put the closing quotes in a docstring on a separate line, even if the line is too long (<a href="https://github-redirect.dependabot.com/psf/black/issues/3430">#3430</a>)</li>
<li>Long values in dict literals are now wrapped in parentheses; correspondingly unnecessary parentheses around short values in dict literals are now removed; long string lambda values are now wrapped in parentheses (<a href="https://github-redirect.dependabot.com/psf/black/issues/3440">#3440</a>)</li>
<li>Fix two crashes in preview style involving edge cases with docstrings (<a href="https://github-redirect.dependabot.com/psf/black/issues/3451">#3451</a>)</li>
<li>Exclude string type annotations from improved string processing; fix crash when the return type annotation is stringified and spans across multiple lines (<a href="https://github-redirect.dependabot.com/psf/black/issues/3462">#3462</a>)</li>
<li>Wrap multiple context managers in parentheses when targeting Python 3.9+ (<a href="https://github-redirect.dependabot.com/psf/black/issues/3489">#3489</a>)</li>
<li>Fix several crashes in preview style with walrus operators used in <code>with</code> statements or tuples (<a href="https://github-redirect.dependabot.com/psf/black/issues/3473">#3473</a>)</li>
<li>Fix an invalid quote escaping bug in f-string expressions where it produced invalid code. Implicitly concatenated f-strings with different quotes can now be merged or quote-normalized by changing the quotes used in expressions. (<a href="https://github-redirect.dependabot.com/psf/black/issues/3509">#3509</a>)</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/psf/black/blob/main/CHANGES.md">psf/black's changelog</a>.</em></p>
<blockquote>
<h2>23.1.0</h2>
<h3>Highlights</h3>
<p>This is the first release of 2023, and following our
<a href="https://black.readthedocs.io/en/stable/the_black_code_style/index.html#stability-policy">stability policy</a>,
it comes with a number of improvements to our stable style, including improvements to
empty line handling, removal of redundant parentheses in several contexts, and output
that highlights implicitly concatenated strings better.</p>
<p>There are also many changes to the preview style; try out <code>black --preview</code> and give us
feedback to help us set the stable style for next year.</p>
<p>In addition to style changes, Black now automatically infers the supported Python
versions from your <code>pyproject.toml</code> file, removing the need to set Black's target
versions separately.</p>
<h3>Stable style</h3>
<!-- raw HTML omitted -->
<ul>
<li>Introduce the 2023 stable style, which incorporates most aspects of last year's
preview style (<a href="https://github-redirect.dependabot.com/psf/black/issues/3418">#3418</a>). Specific changes:
<ul>
<li>Enforce empty lines before classes and functions with sticky leading comments
(<a href="https://github-redirect.dependabot.com/psf/black/issues/3302">#3302</a>) (22.12.0)</li>
<li>Reformat empty and whitespace-only files as either an empty file (if no newline is
present) or as a single newline character (if a newline is present) (<a href="https://github-redirect.dependabot.com/psf/black/issues/3348">#3348</a>)
(22.12.0)</li>
<li>Implicitly concatenated strings used as function args are now wrapped inside
parentheses (<a href="https://github-redirect.dependabot.com/psf/black/issues/3307">#3307</a>) (22.12.0)</li>
<li>Correctly handle trailing commas that are inside a line's leading non-nested parens
(<a href="https://github-redirect.dependabot.com/psf/black/issues/3370">#3370</a>) (22.12.0)</li>
<li><code>--skip-string-normalization</code> / <code>-S</code> now prevents docstring prefixes from being
normalized as expected (<a href="https://github-redirect.dependabot.com/psf/black/issues/3168">#3168</a>) (since 22.8.0)</li>
<li>When using <code>--skip-magic-trailing-comma</code> or <code>-C</code>, trailing commas are stripped from
subscript expressions with more than 1 element (<a href="https://github-redirect.dependabot.com/psf/black/issues/3209">#3209</a>) (22.8.0)</li>
<li>Implicitly concatenated strings inside a list, set, or tuple are now wrapped inside
parentheses (<a href="https://github-redirect.dependabot.com/psf/black/issues/3162">#3162</a>) (22.8.0)</li>
<li>Fix a string merging/split issue when a comment is present in the middle of
implicitly concatenated strings on its own line (<a href="https://github-redirect.dependabot.com/psf/black/issues/3227">#3227</a>) (22.8.0)</li>
<li>Docstring quotes are no longer moved if it would violate the line length limit
(<a href="https://github-redirect.dependabot.com/psf/black/issues/3044">#3044</a>, <a href="https://github-redirect.dependabot.com/psf/black/issues/3430">#3430</a>) (22.6.0)</li>
<li>Parentheses around return annotations are now managed (<a href="https://github-redirect.dependabot.com/psf/black/issues/2990">#2990</a>) (22.6.0)</li>
<li>Remove unnecessary parentheses around awaited objects (<a href="https://github-redirect.dependabot.com/psf/black/issues/2991">#2991</a>) (22.6.0)</li>
<li>Remove unnecessary parentheses in <code>with</code> statements (<a href="https://github-redirect.dependabot.com/psf/black/issues/2926">#2926</a>) (22.6.0)</li>
<li>Remove trailing newlines after code block open (<a href="https://github-redirect.dependabot.com/psf/black/issues/3035">#3035</a>) (22.6.0)</li>
<li>Code cell separators <code>#%%</code> are now standardised to <code># %%</code> (<a href="https://github-redirect.dependabot.com/psf/black/issues/2919">#2919</a>) (22.3.0)</li>
<li>Remove unnecessary parentheses from <code>except</code> statements (<a href="https://github-redirect.dependabot.com/psf/black/issues/2939">#2939</a>) (22.3.0)</li>
<li>Remove unnecessary parentheses from tuple unpacking in <code>for</code> loops (<a href="https://github-redirect.dependabot.com/psf/black/issues/2945">#2945</a>) (22.3.0)</li>
<li>Avoid magic-trailing-comma in single-element subscripts (<a href="https://github-redirect.dependabot.com/psf/black/issues/2942">#2942</a>) (22.3.0)</li>
</ul>
</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/psf/black/commit/b0d1fba7ac3be53c71fb0d3211d911e629f8aecb"><code>b0d1fba</code></a> Prepare release 23.1.0 (<a href="https://github-redirect.dependabot.com/psf/black/issues/3536">#3536</a>)</li>
<li><a href="https://github.com/psf/black/commit/69ca0a4c7a365c5f5eea519a90980bab72cab764"><code>69ca0a4</code></a> Infer target version based on project metadata (<a href="https://github-redirect.dependabot.com/psf/black/issues/3219">#3219</a>)</li>
<li><a href="https://github.com/psf/black/commit/c4bd2e31ceeac84d68592986fe70920f3d3d0443"><code>c4bd2e3</code></a> Draft for Black 2023 stable style (<a href="https://github-redirect.dependabot.com/psf/black/issues/3418">#3418</a>)</li>
<li><a href="https://github.com/psf/black/commit/226cbf0226ee3bc26972357ba54c36409e9a84ae"><code>226cbf0</code></a> Fix unsafe cast in linegen.py w/ await yield handling (<a href="https://github-redirect.dependabot.com/psf/black/issues/3533">#3533</a>)</li>
<li><a href="https://github.com/psf/black/commit/f4ebc683208d095b252b87147d002e925c9c1171"><code>f4ebc68</code></a> Upgrade isort (<a href="https://github-redirect.dependabot.com/psf/black/issues/3534">#3534</a>)</li>
<li><a href="https://github.com/psf/black/commit/6407ebb870afe0062ee581abdea07c1ef5213d31"><code>6407ebb</code></a> Remove Python version in the_basics.md (<a href="https://github-redirect.dependabot.com/psf/black/issues/3528">#3528</a>)</li>
<li><a href="https://github.com/psf/black/commit/196b1f349eb2baa9bbbc483226874cc01fb7567d"><code>196b1f3</code></a> Fix <code>black --help</code> output for <code>--python-cell-magics</code> option to be reproducibl...</li>
<li><a href="https://github.com/psf/black/commit/d950f15987a49a5f3e37127ec718b4c12666b8cf"><code>d950f15</code></a> Update document now that paren wrapping CMs on Python 3.9+ is implemented (<a href="https://github-redirect.dependabot.com/psf/black/issues/3">#3</a>...</li>
<li><a href="https://github.com/psf/black/commit/a36878eb2f375e2ac1e13052f663909f3835ec46"><code>a36878e</code></a> Fix an invalid quote escaping bug in f-string expressions (<a href="https://github-redirect.dependabot.com/psf/black/issues/3509">#3509</a>)</li>
<li><a href="https://github.com/psf/black/commit/eabff673b37c5430d4cf72fa050a189a57be2deb"><code>eabff67</code></a> Format hex code in unicode escape sequences in string literals (<a href="https://github-redirect.dependabot.com/psf/black/issues/2916">#2916</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/psf/black/compare/22.12.0...23.1.0">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=psf/black&package-manager=github_actions&previous-version=22.12.0&new-version=23.1.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- ``@dependabot` rebase` will rebase this PR
- ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
- ``@dependabot` merge` will merge this PR after your CI passes on it
- ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
- ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
- ``@dependabot` reopen` will reopen this PR if it is closed
- ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
bors[bot] and dependabot[bot] authored Feb 1, 2023
2 parents 1a7cdfa + 2793b46 commit 81a3a4e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: '3.x'
- uses: psf/black@22.12.0
- uses: psf/black@23.1.0

ruff:
name: Ruff
Expand Down

0 comments on commit 81a3a4e

Please sign in to comment.