From d208efb65c5f6c5ad6d38199c7da063ac6bed593 Mon Sep 17 00:00:00 2001
From: Bryce Willey <Bryce.Steven.Willey@gmail.com>
Date: Tue, 12 Dec 2023 13:23:47 -0500
Subject: [PATCH 1/5] Adds paren to deps for hidden extra constraint

Fix #4107, in a fairly hacky way though.

Hatch will strip out parenthesis in the extras if it thinks it doesn't need
them. We can, however, add a meaningless restriction like
`and python_version >= '1'` to force hatch to use our parenthesis. Definitely
should have a hatch fix upstream though.
---
 pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 1098412981a..0346cf7b30d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -76,8 +76,8 @@ dynamic = ["readme", "version"]
 colorama = ["colorama>=0.4.3"]
 uvloop = ["uvloop>=0.15.2"]
 d = [
-  "aiohttp>=3.7.4; sys_platform != 'win32' or implementation_name != 'pypy'",
-  "aiohttp>=3.7.4, !=3.9.0; sys_platform == 'win32' and implementation_name == 'pypy'",
+  "aiohttp>=3.7.4 ; (sys_platform != 'win32' or implementation_name != 'pypy') and python_version >= '1'",
+  "aiohttp>=3.7.4, !=3.9.0 ; (sys_platform == 'win32' and implementation_name == 'pypy') and python_version >= '1'",
 ]
 jupyter = [
   "ipython>=7.8.0",

From a5bc51516f6502fdf64565a05f1f829b2ee9267a Mon Sep 17 00:00:00 2001
From: Bryce Willey <Bryce.Steven.Willey@gmail.com>
Date: Wed, 13 Dec 2023 11:39:07 -0500
Subject: [PATCH 2/5] Use patched hatchling, which has the same fix

---
 pyproject.toml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 0346cf7b30d..24b9c07674d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -25,7 +25,7 @@ preview = true
 # NOTE: You don't need this in your own Black configuration.
 
 [build-system]
-requires = ["hatchling>=1.8.0", "hatch-vcs", "hatch-fancy-pypi-readme"]
+requires = ["hatchling>=1.20.0", "hatch-vcs", "hatch-fancy-pypi-readme"]
 build-backend = "hatchling.build"
 
 [project]
@@ -76,8 +76,8 @@ dynamic = ["readme", "version"]
 colorama = ["colorama>=0.4.3"]
 uvloop = ["uvloop>=0.15.2"]
 d = [
-  "aiohttp>=3.7.4 ; (sys_platform != 'win32' or implementation_name != 'pypy') and python_version >= '1'",
-  "aiohttp>=3.7.4, !=3.9.0 ; (sys_platform == 'win32' and implementation_name == 'pypy') and python_version >= '1'",
+  "aiohttp>=3.7.4; sys_platform != 'win32' or implementation_name != 'pypy'",
+  "aiohttp>=3.7.4, !=3.9.0; sys_platform == 'win32' and implementation_name == 'pypy'",
 ]
 jupyter = [
   "ipython>=7.8.0",
@@ -187,7 +187,7 @@ CC = "clang"
 build-frontend = { name = "build", args = ["--no-isolation"] }
 # Unfortunately, hatch doesn't respect MACOSX_DEPLOYMENT_TARGET
 before-build = [
-    "python -m pip install 'hatchling==1.18.0' hatch-vcs hatch-fancy-pypi-readme 'hatch-mypyc>=0.16.0' 'mypy==1.7.1' 'click==8.1.3'",
+    "python -m pip install 'hatchling==1.20.0' hatch-vcs hatch-fancy-pypi-readme 'hatch-mypyc>=0.16.0' 'mypy==1.7.1' 'click==8.1.3'",
     """sed -i '' -e "600,700s/'10_16'/os.environ['MACOSX_DEPLOYMENT_TARGET'].replace('.', '_')/" $(python -c 'import hatchling.builders.wheel as h; print(h.__file__)') """,
 ]
 

From ddf289ca1544df49096ccacc1f574f1997c7426f Mon Sep 17 00:00:00 2001
From: Bryce Willey <Bryce.Steven.Willey@gmail.com>
Date: Wed, 13 Dec 2023 14:07:15 -0500
Subject: [PATCH 3/5] Added PR to changelog

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 9d79b0fb61a..cd43e55b301 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -21,6 +21,7 @@
 ### Packaging
 
 <!-- Changes to how Black is packaged, such as dependency requirements -->
+* Fixed a bug that included dependencies from the `d` extra by default (#4108, #4107).
 
 ### Parser
 

From fc34bc5a36eefb93b7981d80d93cef2ea959a550 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed, 13 Dec 2023 19:11:06 +0000
Subject: [PATCH 4/5] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 CHANGES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index cd43e55b301..22eae377f77 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -21,7 +21,8 @@
 ### Packaging
 
 <!-- Changes to how Black is packaged, such as dependency requirements -->
-* Fixed a bug that included dependencies from the `d` extra by default (#4108, #4107).
+
+- Fixed a bug that included dependencies from the `d` extra by default (#4108, #4107).
 
 ### Parser
 

From e4cf8a2d60d611694100070e9250c9ec1a600bc0 Mon Sep 17 00:00:00 2001
From: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
Date: Wed, 13 Dec 2023 23:03:17 -0800
Subject: [PATCH 5/5] Update CHANGES.md

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 22eae377f77..69fe34a5052 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,7 +22,7 @@
 
 <!-- Changes to how Black is packaged, such as dependency requirements -->
 
-- Fixed a bug that included dependencies from the `d` extra by default (#4108, #4107).
+- Fixed a bug that included dependencies from the `d` extra by default (#4108)
 
 ### Parser