Commit73f6ac0

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 parents516c810 +64a8ec3 commit73f6ac0Copy full SHA for 73f6ac0

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ before_install: \|`
`115`	`115`	`ci/silence brew update`
`116`	`116`	`brew uninstall numpy gdal postgis`
`117`	`117`	`brew unlink python@2`
`118`		`- brew upgrade python`
	`118`	`+ brewinstall python \|\| brewupgrade python`
`119`	`119`	`brew install ffmpeg imagemagick mplayer ccache`
`120`	`120`	`hash -r`
`121`	`121`	`which python`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,8 @@`
`2`	`2`
`3`	`3`	`coverage`
`4`	`4`	`cycler`
`5`		`-numpy`
	`5`	`+# don't forward port this, 3.2.x warns with np 1.19 and up`
	`6`	`+numpy<1.19`
`6`	`7`	`pillow`
`7`	`8`	`pyparsing`
`8`	`9`	`pytest!=4.6.0,!=5.3.3,!=5.4.0`

Comments

(0)