Backport PR #16112 on branch v3.1.x (CI: Fail when failed to i… (#16136)

Kojoley · NelleV · web-flow · commit 7a9a12ae385f · 2020-01-07T21:39:40.000+03:00
Backport PR #16112 on branch v3.1.x (CI: Fail when failed to install dependencies) Co-authored-by: Nelle Varoquaux <nelle.varoquaux@gmail.com>
diff --git a/.travis.yml b/.travis.yml
@@ -112,13 +112,16 @@ before_install: |
   if [[ $TRAVIS_OS_NAME != 'osx' ]]; then
     export PATH=/usr/lib/ccache:$PATH
   else
+    set -e
     ci/silence brew update
     brew uninstall numpy gdal postgis
+    brew unlink python@2
     brew upgrade python
-    brew install ffmpeg imagemagick mplayer ccache font-wenquanyi-zen-hei
+    brew install ffmpeg imagemagick mplayer ccache
     hash -r
     which python
     python --version
+    set +e
     # We could install ghostscript and inkscape here to test svg and pdf
     # but this makes the test time really long.
     # brew install ghostscript inkscape
@@ -135,6 +138,8 @@ install:
   - |
     # Install dependencies from PyPI.
     python -mpip install --upgrade $PRE -r requirements/testing/travis_all.txt $EXTRAREQS $PINNEDVERS
+  - |
+    # Install optional dependencies from PyPI.
     # GUI toolkits are pip-installable only for some versions of Python so
     # don't fail if we can't install them.  Make it easier to check whether the
     # install was successful by trying to import the toolkit (sometimes, the
