[Python-checkins] cpython (2.7): use sphinx from its own virtualenv (closes #20693)

[benjamin.peterson]

http://hg.python.org/cpython/rev/b514339e41ef
changeset:   89321:b514339e41ef
branch:      2.7
parent:      89292:0199bff14c5c
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Feb 22 01:32:50 2014 -0500
summary:
  use sphinx from its own virtualenv (closes #20693)

files:
  Doc/tools/dailybuild.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Doc/tools/dailybuild.py b/Doc/tools/dailybuild.py
--- a/Doc/tools/dailybuild.py
+++ b/Doc/tools/dailybuild.py
@@ -29,6 +29,7 @@
 
 
 BUILDROOT = '/home/gbrandl/docbuild'
+SPHINXBUILD = os.path.join(BUILDROOT, 'sphinx-env/bin/sphinx-build')
 WWWROOT = '/data/ftp.python.org/pub/docs.python.org'
 
 BRANCHES = [
@@ -47,7 +48,7 @@
     print 'Running make autobuild'
     maketarget = 'autobuild-' + ('html' if quick else
                                  ('dev' if isdev else 'stable'))
-    if os.WEXITSTATUS(os.system('cd Doc; make %s' % maketarget)) == 2:
+    if os.WEXITSTATUS(os.system('cd Doc; make SPHINXBUILD=%s %s' % (SPHINXBUILD, maketarget))) == 2:
         print '*' * 80
         return
     print 'Copying HTML files to %s' % target

-- 
Repository URL: http://hg.python.org/cpython