diff options
| author | Charles Karney <charles.karney@sri.com> | 2019-09-22 08:02:27 -0400 |
|---|---|---|
| committer | Charles Karney <charles.karney@sri.com> | 2019-09-22 08:02:27 -0400 |
| commit | c753607ea403b83444d7a4a634b401d563380c81 (patch) | |
| tree | 55abc5f6e2ffa445738c5094b2294fd207c89d17 | |
| parent | 0ea42590008495aa98e59779f0be5b1ba81eb8ee (diff) | |
| parent | 1cef32f18ecfb4f221bde0736c49a9e8f4a47641 (diff) | |
| download | PROJ-c753607ea403b83444d7a4a634b401d563380c81.tar.gz PROJ-c753607ea403b83444d7a4a634b401d563380c81.zip | |
Merge branch 'master' into vs-version-check
Incorportate fix to travis/linux_gcc/before_install.sh
| -rwxr-xr-x | travis/linux_gcc/before_install.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/travis/linux_gcc/before_install.sh b/travis/linux_gcc/before_install.sh index 5564ff8f..f7111631 100755 --- a/travis/linux_gcc/before_install.sh +++ b/travis/linux_gcc/before_install.sh @@ -15,7 +15,10 @@ sudo apt-get install -qq openjdk-7-jdk scripts/cppcheck.sh scripts/doxygen.sh -pip3 install --user sphinxcontrib-bibtex +# Force sphinxcontrib-bibtex version to 0.4.2, because 1.0.0 requires +# sphinx >= 2.0 which is only available on Python >= 3.5, and this config +# has only 3.4 +pip3 install --user sphinxcontrib-bibtex==0.4.2 pip3 install --user cpp-coveralls ./travis/docker.sh |