From 9b2b048692f0bd642f38230b4e61c778a4653f91 Mon Sep 17 00:00:00 2001
From: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Date: Tue, 28 Mar 2023 18:46:04 -0600
Subject: [PATCH] Prepare release 23.3.0 (#3625)

---
 CHANGES.md                                  | 68 ++++++++++++++-------
 docs/integrations/source_version_control.md |  2 +-
 docs/usage_and_configuration/the_basics.md  |  2 +-
 3 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 25710b1..866d548 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,27 +10,10 @@
 
 <!-- Changes that affect Black's stable style -->
 
-- Import lines with `# fmt: skip` and `# fmt: off` no longer have an extra blank line
-  added when they are right after another import line (#3610)
-
 ### Preview style
 
 <!-- Changes that affect Black's preview style -->
 
-- Add trailing commas to collection literals even if there's a comment after the last
-  entry (#3393)
-- `async def`, `async for`, and `async with` statements are now formatted consistently
-  compared to their non-async version. (#3609)
-- `with` statements that contain two context managers will be consistently wrapped in
-  parentheses (#3589)
-- Let string splitters respect [East Asian Width](https://www.unicode.org/reports/tr11/)
-  (#3445)
-- Now long string literals can be split after East Asian commas and periods (`、` U+3001
-  IDEOGRAPHIC COMMA, `。` U+3002 IDEOGRAPHIC FULL STOP, & `，` U+FF0C FULLWIDTH COMMA)
-  besides before spaces (#3445)
-- For stubs, enforce one blank line after a nested class with a body other than just
-  `...` (#3564)
-
 ### Configuration
 
 <!-- Changes to how Black can be configured -->
@@ -43,8 +26,6 @@
 
 <!-- Changes to the parser or to version autodetection -->
 
-- Added support for formatting files with invalid type comments (#3594)
-
 ### Performance
 
 <!-- Changes that improve Black's performance. -->
@@ -61,14 +42,57 @@
 
 <!-- For example, Docker, GitHub Actions, pre-commit, editors -->
 
-- Update GitHub Action to use the version of Black equivalent to action's version if
-  version input is not specified (#3543)
-
 ### Documentation
 
 <!-- Major changes to documentation and policies. Small docs changes
      don't need a changelog entry. -->
 
+## 23.3.0
+
+### Highlights
+
+This release fixes a longstanding confusing behavior in Black's GitHub action, where the
+version of the action did not determine the version of Black being run (issue #3382). In
+addition, there is a small bug fix around imports and a number of improvements to the
+preview style.
+
+Please try out the
+[preview style](https://black.readthedocs.io/en/stable/the_black_code_style/future_style.html#preview-style)
+with `black --preview` and tell us your feedback. All changes in the preview style are
+expected to become part of Black's stable style in January 2024.
+
+### Stable style
+
+- Import lines with `# fmt: skip` and `# fmt: off` no longer have an extra blank line
+  added when they are right after another import line (#3610)
+
+### Preview style
+
+- Add trailing commas to collection literals even if there's a comment after the last
+  entry (#3393)
+- `async def`, `async for`, and `async with` statements are now formatted consistently
+  compared to their non-async version. (#3609)
+- `with` statements that contain two context managers will be consistently wrapped in
+  parentheses (#3589)
+- Let string splitters respect [East Asian Width](https://www.unicode.org/reports/tr11/)
+  (#3445)
+- Now long string literals can be split after East Asian commas and periods (`、` U+3001
+  IDEOGRAPHIC COMMA, `。` U+3002 IDEOGRAPHIC FULL STOP, & `，` U+FF0C FULLWIDTH COMMA)
+  besides before spaces (#3445)
+- For stubs, enforce one blank line after a nested class with a body other than just
+  `...` (#3564)
+
+### Parser
+
+- Added support for formatting files with invalid type comments (#3594)
+
+### Integrations
+
+- Update GitHub Action to use the version of Black equivalent to action's version if
+  version input is not specified (#3543)
+
+### Documentation
+
 - Document that only the most recent release is supported for security issues;
   vulnerabilities should be reported through Tidelift (#3612)
 
diff --git a/docs/integrations/source_version_control.md b/docs/integrations/source_version_control.md
index d462e2c..de52183 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: 23.1.0
+    rev: 23.3.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 2b41c18..b101e17 100644
--- a/docs/usage_and_configuration/the_basics.md
+++ b/docs/usage_and_configuration/the_basics.md
@@ -178,7 +178,7 @@ You can check the version of _Black_ you have installed using the `--version` fl
 
 ```console
 $ black --version
-black, version 23.1.0
+black, version 23.3.0
 ```
 
 An option to require a specific version to be running is also provided.
-- 
2.39.5