diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2017-05-17 11:36:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-17 11:36:02 -0500 |
| commit | cafc3cc3ca5c457d6dcf4fafcb0c94ddedead0e7 (patch) | |
| tree | 5ba3e9f1dbc77185da82e8161a33a6c5d2d9f99a /.travis.yml | |
| parent | b630c06773bb4ba960f8791b756c17a39d049501 (diff) | |
| download | spack-cafc3cc3ca5c457d6dcf4fafcb0c94ddedead0e7.tar.gz spack-cafc3cc3ca5c457d6dcf4fafcb0c94ddedead0e7.tar.bz2 spack-cafc3cc3ca5c457d6dcf4fafcb0c94ddedead0e7.tar.xz spack-cafc3cc3ca5c457d6dcf4fafcb0c94ddedead0e7.zip | |
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.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 2bf21d0e57..c4bfe17640 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,7 +86,8 @@ install: - pip install --upgrade setuptools - pip install --upgrade codecov - pip install --upgrade flake8 - - pip install --upgrade sphinx + - if [[ "$TEST_SUITE" == "doc" ]]; then pip install --upgrade sphinx; fi + - if [[ "$TEST_SUITE" == "doc" ]]; then pip install --upgrade sphinxcontrib-programoutput; fi before_script: # Need this for the git tests to succeed. |