Skip to content

Commit b273ac2

Browse files
committed
Bump Matplotlib in CI to match changes in numpy.
1 parent d603b22 commit b273ac2

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

Diff for: azure-pipelines.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -55,29 +55,25 @@ steps:
5555
;;
5656
darwin)
5757
# python2 unlinking needed until brew sorts that out.
58-
# gs<9.50 is needed until matplotlib#15556 (matplotlib<3.2.0rc2).
5958
brew update >/dev/null &&
6059
brew unlink python@2 &&
6160
brew install cairo pkg-config &&
6261
PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig tools/build-macos-wheel.sh &&
63-
brew install https://raw.githubusercontent.com/sashkab/homebrew-core/996730866806cf0dd13a56beac47c664b1408d94/Formula/ghostscript.rb
62+
brew install ghostscript
6463
;;
6564
win32)
66-
# Pin inkscape until matplotlib#17210 lets us troubleshoot what's wrong
67-
# with newer ones.
68-
choco install --no-progress ghostscript &&
69-
choco install --no-progress inkscape --version=0.92.4.20190121 &&
7065
git clone --depth 1 https://github.com/anntzer/cairocffi-windows-wheels &&
7166
python -mpip install --find-links cairocffi-windows-wheels --prefer-binary cairocffi &&
72-
python tools/build-windows-wheel.py
67+
python tools/build-windows-wheel.py &&
68+
choco install --no-progress ghostscript inkscape
7369
;;
7470
*)
7571
exit 1
7672
;;
7773
esac &&
7874
7975
python -mpip install dist/*.whl &&
80-
python -mpip install matplotlib &&
76+
python -mpip install --pre matplotlib &&
8177
python tools/ensure-mpl-test-data.py &&
8278
# pytest-{instafail,timeout} useful for hanging tests.
8379
python -mpip install pytest pytest-instafail pytest-timeout

0 commit comments

Comments
 (0)