Bug 1252294 - Add python/futures to sys.path when building Sphinx docs; r=chmanchester
authorGregory Szorc <gps@mozilla.com>
Mon, 29 Feb 2016 16:08:34 -0800
changeset 286142 254be11071c8f03ee598aeae055309863103223e
parent 286141 a5afedbecaadff30d5469a6dfb8ec78b96df9340
child 286143 3dee6df0c89099dcab7e6a458f01e4e98f6f3800
push id72671
push usergszorc@mozilla.com
push dateTue, 01 Mar 2016 01:38:03 +0000
treeherdermozilla-inbound@254be11071c8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1252294
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1252294 - Add python/futures to sys.path when building Sphinx docs; r=chmanchester RTD is complaining that it can't find concurrent.futures. We solve this problem on RTD by adjusting sys.path in the Sphinx config file to add paths to the vendored packages. Sadly, there isn't really an easy way to test this before landing. But it should work. MozReview-Commit-ID: FrsLrbbOQWt
tools/docs/conf.py
--- a/tools/docs/conf.py
+++ b/tools/docs/conf.py
@@ -10,16 +10,17 @@ import sys
 
 from datetime import datetime
 
 # Set up Python environment to load build system packages.
 OUR_DIR = os.path.dirname(__file__)
 topsrcdir = os.path.normpath(os.path.join(OUR_DIR, '..', '..'))
 
 EXTRA_PATHS = (
+    'python/futures',
     'python/jsmin',
     'python/mach',
     'python/mozbuild',
     'python/which',
     'testing/mozbase/mozfile',
     'testing/mozbase/mozprocess',
 )