bpo-47138: Ensure Windows docs build uses the same pinned version as other platforms...

(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 7fde063642771375fff4a16e749589953b939205..ac66b56e9a3ef7551e923a44dc40ef8360856df6 100644 (file)
--- 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
     )