From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 29 May 2018 01:03:38 +0000 (-0700)
Subject: bpo-33673: Install python-docs-theme even if Sphinx is already installed (GH-7163)
X-Git-Tag: v3.7.0b5~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a379dea11e989da73c335a83ea7368c5e070987e;p=python

bpo-33673: Install python-docs-theme even if Sphinx is already installed (GH-7163)

(cherry picked from commit 3d3e66c2daebd8e6b18944eac7546168c0006c78)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
---

diff --git a/Doc/make.bat b/Doc/make.bat
index c69cfae319..3a4b365689 100644
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -13,7 +13,13 @@ if not defined SPHINXBUILD (
     %PYTHON% -c "import sphinx" > nul 2> nul
     if errorlevel 1 (
         echo Installing sphinx with %PYTHON%
-        %PYTHON% -m pip install sphinx python-docs-theme
+        %PYTHON% -m pip install sphinx
+        if errorlevel 1 exit /B
+    )
+    %PYTHON% -c "import python_docs_theme" > nul 2> nul
+    if errorlevel 1 (
+        echo Installing python-docs-theme with %PYTHON%
+        %PYTHON% -m pip install python-docs-theme
         if errorlevel 1 exit /B
     )
     set SPHINXBUILD=%PYTHON% -c "import sphinx, sys; sys.argv[0] = 'sphinx-build'; sphinx.main()"