8000 Merge pull request #17863 from meeseeksmachine/auto-backport-of-pr-17… · matplotlib/matplotlib@73f6ac0 · GitHub
[go: up one dir, main page]

Skip to content

Commit 73f6ac0

Browse files
authored
Merge pull request #17863 from meeseeksmachine/auto-backport-of-pr-17862-on-v3.2.x
Backport PR #17862 on branch v3.2.x (CI: Install, or upgrade, Python 3 on homebrew.)
2 parents 516c810 + 64a8ec3 commit 73f6ac0

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ before_install: |
115115
ci/silence brew update
116116
brew uninstall numpy gdal postgis
117117
brew unlink python@2
118-
brew upgrade python
118+
brew install python || brew upgrade python
119119
brew install ffmpeg imagemagick mplayer ccache
120120
hash -r
121121
which python

requirements/testing/travis_all.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
coverage
44
cycler
5-
numpy
5+
# don't forward port this, 3.2.x warns with np 1.19 and up
6+
numpy<1.19
67
pillow
78
pyparsing
89
pytest!=4.6.0,!=5.3.3,!=5.4.0

0 commit comments

Comments
 (0)
0