Sphinx no longer supports Python 2.6 (#4266)

* Sphinx no longer supports Python 2.6

* Update vendored sphinxcontrib.programoutput from 0.9.0 to 0.10.0

* Documentation cannot be built in parallel

* Let Travis install programoutput for us

* Remove vendored sphinxcontrib-programoutput

Recent updates to the sphinx package prevent the vendored version
from being found in sys.path. We don't vendor sphinx, so it doesn't
make sense to vendor sphinxcontrib-programoutput either.
This commit is contained in:
Adam J. Stewart
2017-05-17 11:36:02 -05:00
committed by GitHub
parent b630c06773
commit cafc3cc3ca
8 changed files with 6 additions and 303 deletions

View File

@@ -3,8 +3,7 @@
# You can set these variables from the command line.
SPHINXOPTS = -E
JOBS ?= $(shell python -c 'import multiprocessing; print multiprocessing.cpu_count()')
SPHINXBUILD = sphinx-build -j $(JOBS)
SPHINXBUILD = sphinx-build
PAPER =
BUILDDIR = _build