From 58e18e244437e142386dafe9b8f2bc571980e269 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Tue, 24 Sep 2024 09:56:18 -0700
Subject: [PATCH 1/4] --no-binary charset-normalizer

---
 Doc/requirements.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Doc/requirements.txt b/Doc/requirements.txt
index bf1028020b7af7..a725707700d46e 100644
--- a/Doc/requirements.txt
+++ b/Doc/requirements.txt
@@ -13,6 +13,8 @@ blurb
 sphinxext-opengraph~=0.9.0
 sphinx-notfound-page~=1.0.0
 
+--no-binary charset-normalizer
+
 # The theme used by the documentation is stored separately, so we need
 # to install that as well.
 python-docs-theme>=2023.3.1,!=2023.7

From 35735c32e5dfd224daf6d5091f9a2f2fcdad8d3e Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Tue, 24 Sep 2024 10:10:36 -0700
Subject: [PATCH 2/4] --no-binary :all:

---
 Doc/requirements.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Doc/requirements.txt b/Doc/requirements.txt
index a725707700d46e..e4cf7e56c772f4 100644
--- a/Doc/requirements.txt
+++ b/Doc/requirements.txt
@@ -6,6 +6,9 @@
 # Sphinx version is pinned so that new versions that introduce new warnings
 # won't suddenly cause build failures. Updating the version is fine as long
 # as no warnings are raised by doing so.
+
+--no-binary :all:
+
 sphinx~=8.0.0
 
 blurb
@@ -13,8 +16,6 @@ blurb
 sphinxext-opengraph~=0.9.0
 sphinx-notfound-page~=1.0.0
 
---no-binary charset-normalizer
-
 # The theme used by the documentation is stored separately, so we need
 # to install that as well.
 python-docs-theme>=2023.3.1,!=2023.7

From e0701ea284c6a4b06b0f5c48fb75c0360337f107 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Wed, 25 Sep 2024 10:49:55 -0700
Subject: [PATCH 3/4] Use release version of Python 3.12

---
 .github/workflows/reusable-docs.yml | 26 +++++++++++++++-----------
 Doc/requirements.txt                |  2 --
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/reusable-docs.yml b/.github/workflows/reusable-docs.yml
index 4b384f4b3fa602..3c8a73d271218b 100644
--- a/.github/workflows/reusable-docs.yml
+++ b/.github/workflows/reusable-docs.yml
@@ -96,18 +96,22 @@ jobs:
     timeout-minutes: 60
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/cache@v4
+    - name: 'Set up Python'
+      uses: actions/setup-python@v5
       with:
-        path: ~/.cache/pip
-        key: ubuntu-doc-${{ hashFiles('Doc/requirements.txt') }}
-        restore-keys: |
-          ubuntu-doc-
-    - name: 'Install Dependencies'
-      run: sudo ./.github/workflows/posix-deps-apt.sh && sudo apt-get install wamerican
-    - name: 'Configure CPython'
-      run: ./configure --with-pydebug
-    - name: 'Build CPython'
-      run: make -j4
+        python-version: '3.12'
+#    - uses: actions/cache@v4
+#      with:
+#        path: ~/.cache/pip
+#        key: ubuntu-doc-${{ hashFiles('Doc/requirements.txt') }}
+#        restore-keys: |
+#          ubuntu-doc-
+#    - name: 'Install Dependencies'
+#      run: sudo ./.github/workflows/posix-deps-apt.sh && sudo apt-get install wamerican
+#    - name: 'Configure CPython'
+#      run: ./configure --with-pydebug
+#    - name: 'Build CPython'
+#      run: make -j4
     - name: 'Install build dependencies'
       run: make -C Doc/ PYTHON=../python venv
     # Use "xvfb-run" since some doctest tests open GUI windows
diff --git a/Doc/requirements.txt b/Doc/requirements.txt
index e4cf7e56c772f4..d89fc0dc518e94 100644
--- a/Doc/requirements.txt
+++ b/Doc/requirements.txt
@@ -7,8 +7,6 @@
 # won't suddenly cause build failures. Updating the version is fine as long
 # as no warnings are raised by doing so.
 
---no-binary :all:
-
 sphinx~=8.0.0
 
 blurb

From bce3fc2f45c7413fa6188703d4168917859a23ad Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Wed, 25 Sep 2024 11:58:27 -0700
Subject: [PATCH 4/4] Use release version of Python 3.12 for doctest

---
 .github/workflows/reusable-docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/reusable-docs.yml b/.github/workflows/reusable-docs.yml
index 3c8a73d271218b..a2f435a9efa1c8 100644
--- a/.github/workflows/reusable-docs.yml
+++ b/.github/workflows/reusable-docs.yml
@@ -113,7 +113,7 @@ jobs:
 #    - name: 'Build CPython'
 #      run: make -j4
     - name: 'Install build dependencies'
-      run: make -C Doc/ PYTHON=../python venv
+      run: make -C Doc/ PYTHON=python3 venv
     # Use "xvfb-run" since some doctest tests open GUI windows
     - name: 'Run documentation doctest'
       run: xvfb-run make -C Doc/ PYTHON=../python SPHINXERRORHANDLING="-W --keep-going" doctest