From 27d20144a7517594e24a1649451177b2a11284be Mon Sep 17 00:00:00 2001
From: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Date: Thu, 6 Oct 2022 15:33:51 -0700
Subject: [PATCH] Prepare release 22.10.0 (#3311)

---
 CHANGES.md                                  | 72 +++++++++++++--------
 docs/faq.md                                 |  2 +-
 docs/integrations/source_version_control.md |  2 +-
 docs/usage_and_configuration/the_basics.md  |  2 +-
 4 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index ffdbd9c7aff..3a8cf4d6af5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,42 +6,22 @@
 
 <!-- Include any especially major or disruptive changes here -->
 
-- Runtime support for Python 3.6 has been removed. Formatting 3.6 code will still be
-  supported until further notice.
-
 ### Stable style
 
 <!-- Changes that affect Black's stable style -->
 
-- Fix a crash when `# fmt: on` is used on a different block level than `# fmt: off`
-  (#3281)
-
 ### Preview style
 
 <!-- Changes that affect Black's preview style -->
 
-- Fix a crash when formatting some dicts with parenthesis-wrapped long string keys
-  (#3262)
-
 ### Configuration
 
 <!-- Changes to how Black can be configured -->
 
-- `.ipynb_checkpoints` directories are now excluded by default (#3293)
-- Add `--skip-source-first-line` / `-x` option to ignore the first line of source code
-  while formatting (#3299)
-
 ### Packaging
 
 <!-- Changes to how Black is packaged, such as dependency requirements -->
 
-- Executables made with PyInstaller will no longer crash when formatting several files
-  at once on macOS. Native x86-64 executables for macOS are available once again.
-  (#3275)
-- Hatchling is now used as the build backend. This will not have any effect for users
-  who install Black with its wheels from PyPI. (#3233)
-- Faster compiled wheels are now available for CPython 3.11 (#3276)
-
 ### Parser
 
 <!-- Changes to the parser or to version autodetection -->
@@ -56,22 +36,61 @@
 
 ### _Blackd_
 
-- Windows style (CRLF) newlines will be preserved (#3257).
+<!-- Changes to blackd -->
 
 ### Integrations
 
 <!-- For example, Docker, GitHub Actions, pre-commit, editors -->
 
-- Update GitHub Action to support formatting of Jupyter Notebook files via a `jupyter`
-  option (#3282)
-- Update GitHub Action to support use of version specifiers (e.g. `<23`) for Black
-  version (#3265)
-
 ### Documentation
 
 <!-- Major changes to documentation and policies. Small docs changes
      don't need a changelog entry. -->
 
+## 22.10.0
+
+### Highlights
+
+- Runtime support for Python 3.6 has been removed. Formatting 3.6 code will still be
+  supported until further notice.
+
+### Stable style
+
+- Fix a crash when `# fmt: on` is used on a different block level than `# fmt: off`
+  (#3281)
+
+### Preview style
+
+- Fix a crash when formatting some dicts with parenthesis-wrapped long string keys
+  (#3262)
+
+### Configuration
+
+- `.ipynb_checkpoints` directories are now excluded by default (#3293)
+- Add `--skip-source-first-line` / `-x` option to ignore the first line of source code
+  while formatting (#3299)
+
+### Packaging
+
+- Executables made with PyInstaller will no longer crash when formatting several files
+  at once on macOS. Native x86-64 executables for macOS are available once again.
+  (#3275)
+- Hatchling is now used as the build backend. This will not have any effect for users
+  who install Black with its wheels from PyPI. (#3233)
+- Faster compiled wheels are now available for CPython 3.11 (#3276)
+
+### _Blackd_
+
+- Windows style (CRLF) newlines will be preserved (#3257).
+
+### Integrations
+
+- Vim plugin: add flag (`g:black_preview`) to enable/disable the preview style (#3246)
+- Update GitHub Action to support formatting of Jupyter Notebook files via a `jupyter`
+  option (#3282)
+- Update GitHub Action to support use of version specifiers (e.g. `<23`) for Black
+  version (#3265)
+
 ## 22.8.0
 
 ### Highlights
@@ -126,7 +145,6 @@
 - Vim plugin: prefix messages with `Black: ` so it's clear they come from Black (#3194)
 - Docker: changed to a /opt/venv installation + added to PATH to be available to
   non-root users (#3202)
-- Vim plugin: add flag (`g:black_preview`) to enable/disable the preview style (#3246)
 
 ### Output
 
diff --git a/docs/faq.md b/docs/faq.md
index 8b9ffb0202e..bc9deccb756 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -95,7 +95,7 @@ Support for formatting Python 2 code was removed in version 22.0. While we've ma
 plans to stop supporting older Python 3 minor versions immediately, their support might
 also be removed some time in the future without a deprecation period.
 
-Runtime support for 3.6 was removed in version 22.9.0.
+Runtime support for 3.6 was removed in version 22.10.0.
 
 ## Why does my linter or typechecker complain after I format my code?
 
diff --git a/docs/integrations/source_version_control.md b/docs/integrations/source_version_control.md
index 31d0df27273..4189b5c4b06 100644
--- a/docs/integrations/source_version_control.md
+++ b/docs/integrations/source_version_control.md
@@ -7,7 +7,7 @@ Use [pre-commit](https://pre-commit.com/). Once you
 ```yaml
 repos:
   - repo: https://github.com/psf/black
-    rev: 22.8.0
+    rev: 22.10.0
     hooks:
       - id: black
         # It is recommended to specify the latest version of Python
diff --git a/docs/usage_and_configuration/the_basics.md b/docs/usage_and_configuration/the_basics.md
index aa176c4ba3f..20aa956dd85 100644
--- a/docs/usage_and_configuration/the_basics.md
+++ b/docs/usage_and_configuration/the_basics.md
@@ -173,7 +173,7 @@ You can check the version of _Black_ you have installed using the `--version` fl
 
 ```console
 $ black --version
-black, version 22.8.0
+black, version 22.10.0
 ```
 
 An option to require a specific version to be running is also provided.