10000 Backport PR #16112 on branch v2.2.x (CI: Fail when failed to install … · QuLogic/matplotlib@5e13fa9 · GitHub
[go: up one dir, main page]

Skip to content

Commit 5e13fa9

Browse files
KojoleyNelleVtacaswell
committed
Backport PR matplotlib#16112 on branch v2.2.x (CI: Fail when failed to install dependencies) (matplotlib#16137)
* Merge pull request matplotlib#16112 from Kojoley/ci-travis-fail-when-dep-install-fails CI: Fail when failed to install dependencies * CI: backport osx on travis changes en-mass This will move testing on travis to python3 (from python2), however I am not sure it is worth the effort of moving brew on travis back to python2 so that we can in very short order delete this branch and close out the 2.2.x series (now that python2 is EOL). * CI: accept that brew will be verbose * CI: bump sphinx version to pick up support for newer docutils * CI: remove mac builds on travis The brew configuration has bit-rotted * CI: remove the nightly build from travis * CI: add py38 to build matrix * Revert "CI: remove mac builds on travis" This reverts commit 4da7fa1. * CI: try removing the osx_image specification Co-authored-by: Nelle Varoquaux <nelle.varoquaux@gmail.com> Co-authored-by: Thomas A Caswell <tcaswell@gmail.com>
1 parent e852446 commit 5e13fa9

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

.travis.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ matrix:
8787
- PYTEST_COV=pytest-cov==2.3.1
8888
- PYTEST_RERUNFAILURES='pytest-rerunfailures<6' # 6 needs pytest >=3.8
8989
- PYTEST_TIMEOUT=pytest-timeout==1.2.1 # Newer pytest-timeouts don't support pytest <3.4.
90-
- SPHINX=sphinx==1.3
90+
- SPHINX=sphinx==1.3.3
9191
- python: 3.4
9292
env:
9393
- PYTHON_ARGS=-OO
@@ -96,10 +96,8 @@ matrix:
9696
env: DELETE_FONT_CACHE=1 PANDAS='pandas<0.21.0' PYTEST_PEP8=pytest-pep8 RUN_PEP8=--pep8
9797
- python: 3.7
9898
sudo: true
99-
- python: "nightly"
100-
env: PRE=--pre
99+
- python: 3.8
101100
- os: osx
102-
osx_image: xcode7.3
103101
language: generic # https://github.com/travis-ci/travis-ci/issues/2312
104102
env:
105103
- MOCK=mock
@@ -114,8 +112,7 @@ matrix:
114112
# `cache` does not support `env`-like `global` so copy-paste from top
115113
- $HOME/.ccache # https://github.com/travis-ci/travis-ci/issues/5853
116114
- $HOME/.cache/matplotlib
117-
allow_failures:
118-
- python: "nightly"
115+
119116

120117
before_install:
121118
- |
@@ -125,13 +122,20 @@ before_install:
125122
export PATH=$PATH:/tmp/λ
126123
export PATH=/usr/lib/ccache:$PATH
127124
else
125+
set -e
128126
brew update
129-
brew tap homebrew/gui
130-
# brew install python libpng ffmpeg imagemagick mplayer ccache
127+
brew uninstall numpy gdal postgis
128+
brew unlink python@2
129+
brew upgrade python
130+
brew install ffmpeg imagemagick mplayer ccache
131+
hash -r
132+
which python
133+
python --version
134+
set +e
131135
# We could install ghostscript and inkscape here to test svg and pdf
132136
# but this makes the test time really long.
133137
# brew install ghostscript inkscape
134-
export PATH=/usr/local/opt/ccache/libexec:$PATH
138+
export PATH=/usr/local/opt/python/libexec/bin:/usr/local/opt/ccache/libexec:$PATH
135139
fi
136140
137141
install:
@@ -159,6 +163,8 @@ install:
159163
$PYPARSING \
160164
$DATEUTIL \
161165
$SPHINX
166+
- |
167+
# Install optional dependencies from PyPI.
162168
# GUI toolkits are pip-installable only for some versions of Python so
163169
# don't fail if we can't install them. Make it easier to check whether the
164170
# install was successful by trying to import the toolkit (sometimes, the

0 commit comments

Comments
 (0)
0