[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

add new mail identities

Merge commit '882d8795c6ff65c02f2657e596391748d1b6b7f5'

Fix merging implicit multiline strings that have inline comments (#3956)

* Fix test behaviour

* Add new test cases

* Skip merging strings that have inline comments

* Don't merge lines with multiline strings with inline comments

* Changelog entry

* Document implicit multiline string merging rules

* Fix PR number

Prepare release 23.10.0 (#3951)

Fix parser bug where "type" was misinterpreted as a keyword inside a match (#3950)

Fixes #3790

Slightly hacky, but I think this is correct and it should also improve performance somewhat.

Fix grammar for type alias support (#3949)

Fixes #3948

Treat raw strings like other docstrings (#3947)

Fixes #3944

Fix long lines with power operator(s) getting splitted before line length (#3942)

Fixes #3889

Migrate mypy config to pyproject.toml (#3936)

Co-authored-by: Charles Patel <charles.patel@apkudo.com>

CI Test: Deprecating 'Healthcheck.all()' from Hypothesis in fuzz.py (#3945)

Fix test that was not being run (#3939)

Standardise newlines after module-level docstrings (#3932)

Co-authored-by: jpy-git <josephyoung.jpy@gmail.com>
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>

Report all stacktraces in verbose mode (#3938)

Previously these were swallowed (unlike the ones in black/__init__.py)

Fix cache versioning when BLACK_CACHE_DIR is set (#3937)

Use inline flags for test cases (#3931)

Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>

Drop support for parsing Python 2 (#3933)

Bump pypa/cibuildwheel from 2.16.1 to 2.16.2 (#3934)

Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.16.1 to 2.16.2.
- [Release notes](https://github.com/pypa/cibuildwheel/releases)
- [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md)
- [Commits](https://github.com/pypa/cibuildwheel/compare/v2.16.1...v2.16.2)

---
updated-dependencies:
- dependency-name: pypa/cibuildwheel
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Set Docker to use 3.11 for now (#3927)

Until we get new aiohttp wheels we need to build with 3.11.
You can see an example of a fail here:

Workaround for #3919 - Will leave it open until we can move to 3.21

Update output display to job summary (#3914)

* Update output display to job summary

* fix: handled exit-code of script

* added changelog message

Remove `$`, `>>>` and other prompt prefixes when code copied from the… (#3884)

Adding configurations for sphinx-copybutton in conf.py
https://sphinx-copybutton.readthedocs.io/en/latest/use.html#using-regexp-prompt-identifiers

exclude tests/data/.* from mypy (#3917)

Update link to VS Code formatting instructions (#3921)

Update link

respect magic trailing commas in return types (#3916)

[pre-commit.ci] pre-commit autoupdate (#3915)

updates:
- [github.com/pre-commit/mirrors-mypy: v1.5.0 → v1.5.1](https://github.com/pre-commit/mirrors-mypy/compare/v1.5.0...v1.5.1)
- [github.com/pre-commit/mirrors-prettier: v3.0.1 → v3.0.3](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.1...v3.0.3)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

docs: use LSP for SublimeText 4 (#3913)

Bump pypa/cibuildwheel from 2.16.0 to 2.16.1 (#3911)

Fix up changelog (#3910)

Fix comments getting removed from inside parenthesized strings (#3909)

Since the id of the old leaf may be
the key to comments, the new leaf
must adopt the old comments

Try newer clang in diff-shades job (#3904)

add support for printing the diff of AST trees when running tests (#3902)

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>

Bump pypa/cibuildwheel from 2.15.0 to 2.16.0 (#3901)

Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.15.0 to 2.16.0.
- [Release notes](https://github.com/pypa/cibuildwheel/releases)
- [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md)
- [Commits](https://github.com/pypa/cibuildwheel/compare/v2.15.0...v2.16.0)

---
updated-dependencies:
- dependency-name: pypa/cibuildwheel
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

added the py311 to target-version config (#3898)

fix indentation of line breaks in long type hints by adding parens (#3899)

* fix indentation of line breaks in long type hints by adding parentheses, and remove unnecessary parentheses

* add entry in CHANGES.md, make the style change only in preview mode

Remove outdated mentions of runtime support of Python 3.7 (#3896)

Remove mentions of runtime support of Python 3.7

Runtime support of Python 3.7 was removed in
b4dca26c7d93f930bbd5a7b552807370b60d4298 but a few mentions of it being
supported have remained until now.

Bump actions/checkout from 3 to 4 (#3893)

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump docker/setup-qemu-action from 2 to 3 (#3890)

Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2 to 3.
- [Release notes](https://github.com/docker/setup-qemu-action/releases)
- [Commits](https://github.com/docker/setup-qemu-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/setup-qemu-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump docker/setup-buildx-action from 2 to 3 (#3892)

Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump docker/login-action from 2 to 3 (#3891)

Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump docker/build-push-action from 4 to 5 (#3894)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v4...v5)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump sphinx from 7.2.5 to 7.2.6 in /docs (#3895)

Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 7.2.5 to 7.2.6.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES.rst)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v7.2.5...v7.2.6)

---
updated-dependencies:
- dependency-name: sphinx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Document disabling E704 (#3888)

Linking #3887

mypyc build improvements (#3881)

Build in separate jobs. This makes it clearer if e.g. a single Python
version is failing. It also potentially gets you more parallelism.

Build everything on push to master.

Only build Linux 3.8 and 3.11 wheels on PRs.

Bump docutils from 0.19 to 0.20.1 in /docs (#3699)

Bumps [docutils](https://docutils.sourceforge.io/) from 0.19 to 0.20.1.

Bump sphinx from 7.2.3 to 7.2.5 in /docs (#3882)

Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 7.2.3 to 7.2.5.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v7.2.3...v7.2.5)

Fix broken url in editors.md (#3885)

* Fix broken url in editors.md

Update a link pointing to the Arch Linux repos.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Bump actions/checkout from 3 to 4 (#3883)

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Prepare release 23.9.1 (#3878)

mypyc builds on PRs, skip mypyc wheels for 3.12 (#3870)

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>

Pickle raw tuples in FileData cache (#3877)

Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>

Re-export black.Mode (#3875)

Ignore aiohttp DeprecationWarning for 3.12 (#3876)

Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>

Upgrade to Furo 2023.9.10 to fix docs build (#3873)

Add mypyc test marks to new tests that patch (#3871)

This is enough for me to get a clean test run on Python 3.9 with mypyc.
I have not been able to repro the pickle failures on either Linux or
macOS.

Bump RTD Python version from 3.8 to 3.11 (#3868)

Recent ReadTheDocs builds have been failing as our documentation dependencies (notably Sphinx) require Python 3.9+.

Add classifier for 3.12 (#3866)

Upgrade mypy (#3864)

Prepare release 23.9.0 (#3863)

Blank line between nested and function def in stub files. (#3862)

The idea behind this change is that we stop looking into previous body to determine if there should be a blank before a function or class definition.

Input:

```python
import sys

if sys.version_info > (3, 7):
    class Nested1:
        assignment = 1
        def function_definition(self): ...
    def f1(self) -> str: ...
    class Nested2:
        def function_definition(self): ...
        assignment = 1
    def f2(self) -> str: ...

if sys.version_info > (3, 7):
    def nested1():
        assignment = 1
        def function_definition(self): ...
    def f1(self) -> str: ...
    def nested2():
        def function_definition(self): ...
        assignment = 1
    def f2(self) -> str: ...
```

Stable style
```python
import sys

if sys.version_info > (3, 7):
    class Nested1:
        assignment = 1
        def function_definition(self): ...

    def f1(self) -> str: ...

    class Nested2:
        def function_definition(self): ...
        assignment = 1
    def f2(self) -> str: ...

if sys.version_info > (3, 7):
    def nested1():
        assignment = 1
        def function_definition(self): ...

    def f1(self) -> str: ...
    def nested2():
        def function_definition(self): ...
        assignment = 1
    def f2(self) -> str: ...
```

In the stable formatting, we have a blank line sometimes, not depending on the previous statement on the same level, but on the last (potentially nested) statement in the previous body.

#2783/#3564 fixes this for classes in preview style:

```python
import sys

if sys.version_info > (3, 7):
    class Nested1:
        assignment = 1
        def function_definition(self): ...

    def f1(self) -> str: ...

    class Nested2:
        def function_definition(self): ...
        assignment = 1

    def f2(self) -> str: ...

if sys.version_info > (3, 7):
    def nested1():
        assignment = 1
        def function_definition(self): ...

    def f1(self) -> str: ...
    def nested2():
        def function_definition(self): ...
        assignment = 1
    def f2(self) -> str: ...
```

This PR additionally fixes this for function definitions:

```python
if sys.version_info > (3, 7):
    if sys.platform == "win32":
        assignment = 1
        def function_definition(self): ...

    def f1(self) -> str: ...
    if sys.platform != "win32":
        def function_definition(self): ...
        assignment = 1

    def f2(self) -> str: ...

if sys.version_info > (3, 8):
    if sys.platform == "win32":
        assignment = 1
        def function_definition(self): ...

    class F1: ...
    if sys.platform != "win32":
        def function_definition(self): ...
        assignment = 1

    class F2: ...
```

You can see the effect of this change on typeshed in https://github.com/konstin/typeshed/pull/1/files. As baseline, the preview mode changes without this PR are at https://github.com/konstin/typeshed/pull/2.

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>

Avoid removing whitespace for walrus operators within subscripts (#3823)

Co-authored-by: hauntsaninja <hauntsaninja@gmail.com>
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>

Add Black PyCharm 2023.2 integration instructions (#3839)

blackd: fix mishandling of single character input (#3558)

Apply ignore logic before symlink resolution (#3846)

This means, for instance, that a gitignored symlink cannot affect your
formatting. Fixes #3527, fixes #3826

Move coverage configurations to `pyproject.toml` (#3858)

Bump furo from 2023.7.26 to 2023.8.19 in /docs + sphinx to 7.2.3 (#3848)

* Bump furo from 2023.7.26 to 2023.8.19 in /docs

Bumps [furo](https://github.com/pradyunsg/furo) from 2023.7.26 to 2023.8.19.
- [Release notes](https://github.com/pradyunsg/furo/releases)
- [Changelog](https://github.com/pradyunsg/furo/blob/main/docs/changelog.md)
- [Commits](https://github.com/pradyunsg/furo/compare/2023.07.26...2023.08.19)

---
updated-dependencies:
- dependency-name: furo
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
* Move to sphinx 7.2.3 + fix intersphinx_mapping

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Cooper Ry Lees <me@cooperlees.com>

Fix download badge link (#3853)

Improve handling of root to get_sources (#3847)

This is a little more type safe and a little cleaner

Remove tox pin (#3844)

Improve caching by comparing file hashes as fallback for mtime and size (#3821)

Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>

Pin tox to fix CI (#3843)

[pre-commit.ci] pre-commit autoupdate (#3837)

Make pre-commit do less (#3838)

Bump pypa/cibuildwheel from 2.14.1 to 2.15.0 (#3836)

Remove ENV_PATH on Black action completion (#3759)

[pre-commit.ci] pre-commit autoupdate (#3833)

updates:
- [github.com/pre-commit/mirrors-prettier: v3.0.0 → v3.0.1](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.0...v3.0.1)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

More concise formatting for dummy implementations (#3796)

Document pre-commit mirror (#3828)

[pre-commit.ci] pre-commit autoupdate (#3825)

Bump furo from 2023.5.20 to 2023.7.26 in /docs (#3824)

Bumps [furo](https://github.com/pradyunsg/furo) from 2023.5.20 to 2023.7.26.
- [Release notes](https://github.com/pradyunsg/furo/releases)
- [Changelog](https://github.com/pradyunsg/furo/blob/main/docs/changelog.md)
- [Commits](https://github.com/pradyunsg/furo/compare/2023.05.20...2023.07.26)

---
updated-dependencies:
- dependency-name: furo
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Add Lyft to organizations using black (#3818)

Rewrite mostly useless assert in test_trans.py (#3810)

This PR updates an assert statement that checks the bounds of a
string-slicing operation. The updated assertion provides more accurate
and informative error handling by specifically checking the relative
values of the indices and the string length.

The original assertion was essentially checking if Python's string
slicing was behaving as expected. However, it wasn't providing any
guarantees or useful information about the bounds i and j themselves.

The updated assertion checks that the indices used for slicing are
within the bounds of the string. It will throw an AssertionError if the
indices are out of bounds or if i > j, providing a more specific and
informative error.

Fix typo in `target-version` param wrongly used in plural (#3817)

 Fix unintentionally swapped words in index.md (#3809)

Fix unintentionally swapped words in index.md

I think the intent was to say "large changes in formatting", because it doesn't make sense to say "large formatting in changes".

Fixing pre-commit using pyyaml with broken version (#3804)

Simplify empty line tracker (#3797)

Improvements to contributing docs (#3753)

Fix diff-shades comment missing newlines (#3799)

Preserving newlines is done differently when writing to $GITHUB_OUTPUT
over the deprecated :set-output: command.

Bump pypa/cibuildwheel from 2.13.1 to 2.14.1 (#3795)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Fix most blib2to3 lint (#3794)

Maintainers += Shantanu Jain (hauntsaninja) (#3792)

Avoid importing `IPython` if notebook cells do not contain magics (#3782)

Co-authored-by: hauntsaninja <hauntsaninja@gmail.com>
Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>

Continue to avoid Click typing issue (#3791)

Document shebang comment behaviour (#3787)

[pre-commit.ci] pre-commit autoupdate (#3780)

updates:
- [github.com/pycqa/flake8: 4.0.1 → 6.0.0](https://github.com/pycqa/flake8/compare/4.0.1...6.0.0)
- [github.com/pre-commit/mirrors-prettier: v2.7.1 → v3.0.0](https://github.com/pre-commit/mirrors-prettier/compare/v2.7.1...v3.0.0)
- [github.com/pre-commit/pre-commit-hooks: v4.3.0 → v4.4.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.3.0...v4.4.0)

Fix lint in test_ipynb (#3781)

Unblocks #3780

Remove unneeded mypy dependencies (#3783)

Remove Python 3.7 from classifiers (#3784)

Follow-up on https://github.com/psf/black/pull/3765

Fix typo in CITATION.cff (#3779)

Fix tiny typo in CITATION.cff

Prepare release 23.7.0 (#3776)

Unpin pytest-xdist (#3772)

Disable coverage on pypy tests (#3777)

The pypy tests are reeeeaaally slow. Maybe this will help.