]> granicus.if.org Git - python/commitdiff
Mac installer build now needs venv for docs build (#2828) (#2830)
authorNed Deily <nad@python.org>
Sun, 23 Jul 2017 21:10:40 +0000 (17:10 -0400)
committerGitHub <noreply@github.com>
Sun, 23 Jul 2017 21:10:40 +0000 (17:10 -0400)
(cherry picked from commit 4c7532e96da19f2d5543bdab2b972797699c37d5)

Mac/BuildScript/build-installer.py

index 1fff052e2489b2085dd0a8cccf72d6f3e83faf61..4cb7e3214cd40a0c7abbf6f3ffaa2bfdce39d1bb 100755 (executable)
@@ -1088,10 +1088,10 @@ def buildPythonDocs():
     docdir = os.path.join(rootDir, 'pydocs')
     curDir = os.getcwd()
     os.chdir(buildDir)
-    # The Doc build changed for 3.4 (technically, for 3.4.1) and for 2.7.9
     runCommand('make clean')
-    # Assume sphinx-build is on our PATH, checked in checkEnvironment
-    runCommand('make html')
+    # Create virtual environment for docs builds with blurb and sphinx
+    runCommand('make venv')
+    runCommand('make html PYTHON=venv/bin/python')
     os.chdir(curDir)
     if not os.path.exists(docdir):
         os.mkdir(docdir)