From 65008d19ca475394a15c43e3c342396532ad1774 Mon Sep 17 00:00:00 2001
From: bastimeyer <mail@bastimeyer.de>
Date: Fri, 28 Jul 2023 18:08:17 +0200
Subject: [PATCH 1/3] docs: bump and reorder docs-requirements

- Bump max version of sphinx from <7 to <8
- Bump max version of myst-parser to <3
- Pinpoint sphinx-design to 0.5.0
- Properly group dependencies by type
---
 docs-requirements.txt | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/docs-requirements.txt b/docs-requirements.txt
index d6cf287e6ae..01c50b4414d 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,7 +1,13 @@
-sphinx >=5.0.0, <7
+# setup
+versioningit >=2.0.0,<3  # required for reading the version string when building from git
+
+# build
+sphinx >=5.0.0,<8
+
+# themes and extensions
 furo ==2023.03.27
-myst-parser >=1.0.0, <2
-sphinx-design >=0.4.1, <1
-versioningit >=2.0.0, <3
+myst-parser >=1.0.0,<3
+sphinx-design ==0.5.0
 
+# typing
 docutils-stubs

From 80ca8cc0dbff2f557b78fa610691e4fbf0d305cc Mon Sep 17 00:00:00 2001
From: bastimeyer <mail@bastimeyer.de>
Date: Fri, 28 Jul 2023 17:54:46 +0200
Subject: [PATCH 2/3] chore: reorder dev-requirements

- Properly group dependencies by type
- Remove typing-extensions from dev-requirements, as it's already
  a runtime dependency since 6.0.0
---
 dev-requirements.txt | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/dev-requirements.txt b/dev-requirements.txt
index 9b3e21e4528..07cd54ac0b0 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,24 +1,29 @@
+# setup
 pip >=21.0.0
+versioningit >=2.0.0,<3  # required for being able to run editable installs
 
+# tests
 pytest >=6.0.0
 pytest-asyncio
-pytest-cov
 pytest-trio
-coverage[toml]
 requests-mock
-freezegun>=1.0.0
-shtab
-versioningit >=2.0.0, <3
+freezegun >=1.0.0
 
-# required by script/generate-cdp.py
-inflection
+# code-coverage
+pytest-cov
+coverage[toml]
 
+# code-linting
 ruff ==0.0.272
 
+# typing
 mypy
 lxml-stubs
 trio-typing
 types-freezegun
 types-requests
 types-urllib3
-typing_extensions
+
+# scripts
+shtab  # required by script/build-shell-completions.sh
+inflection  # required by script/generate-cdp.py

From 3cd4378a4da8c7f42ceea3c7d50b41237b86daca Mon Sep 17 00:00:00 2001
From: bastimeyer <mail@bastimeyer.de>
Date: Sat, 29 Jul 2023 00:38:38 +0200
Subject: [PATCH 3/3] docs: bump furo theme to 2023.07.26

- Bump furo sphinx theme to latest version
- Require sphinx >=6.0.0
---
 docs-requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs-requirements.txt b/docs-requirements.txt
index 01c50b4414d..d158d964cee 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -2,10 +2,10 @@
 versioningit >=2.0.0,<3  # required for reading the version string when building from git
 
 # build
-sphinx >=5.0.0,<8
+sphinx >=6.0.0,<8
 
 # themes and extensions
-furo ==2023.03.27
+furo ==2023.07.26
 myst-parser >=1.0.0,<3
 sphinx-design ==0.5.0