From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 29 Mar 2022 00:10:30 +0000 (-0700)
Subject: bpo-47138: Ensure Windows docs build uses the same pinned version as other platforms... 
X-Git-Tag: v3.9.13~159
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d2c6a4428d52c108f4b06dcd1bb86023541c60ce;p=thirdparty%2FPython%2Fcpython.git

bpo-47138: Ensure Windows docs build uses the same pinned version as other platforms (GH-32161)

(cherry picked from commit 0dfabf9b4a58b835b61fc3d17784d4746f677e56)

Co-authored-by: Steve Dower <steve.dower@python.org>
---

diff --git a/Doc/make.bat b/Doc/make.bat
index 7fde06364277..ac66b56e9a3e 100644
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -13,7 +13,7 @@ if not defined SPHINXBUILD (
     %PYTHON% -c "import sphinx" > nul 2> nul
     if errorlevel 1 (
         echo Installing sphinx with %PYTHON%
-        %PYTHON% -m pip install sphinx==2.2.0
+        %PYTHON% -m pip install -r requirements.txt
         if errorlevel 1 exit /B
     )
     set SPHINXBUILD=%PYTHON% -c "import sphinx.cmd.build, sys; sys.exit(sphinx.cmd.build.main())"
@@ -30,6 +30,7 @@ if not defined BLURB (
     %PYTHON% -c "import blurb" > nul 2> nul
     if errorlevel 1 (
         echo Installing blurb with %PYTHON%
+        rem Should have been installed with Sphinx earlier
         %PYTHON% -m pip install blurb
         if errorlevel 1 exit /B
     )