From 721f4f72204237b1269d7f9445ad169b585321a3 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 8 Jul 2020 19:51:27 -0400 Subject: [PATCH 1/2] Backport PR #17862: CI: Install, or upgrade, Python 3 on homebrew. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index acb5b887340a..a20bb3dd6827 100644 --- a/.travis.yml +++ b/.travis.yml @@ -115,7 +115,7 @@ before_install: | ci/silence brew update brew uninstall numpy gdal postgis brew unlink python@2 - brew upgrade python + brew install python || brew upgrade python brew install ffmpeg imagemagick mplayer ccache hash -r which python From 64a8ec34e0db22c017478d48c5f9537f49fda56a Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Fri, 10 Jul 2020 20:09:08 -0400 Subject: [PATCH 2/2] TST: pin numpy back in 3.2.x tests We did not backport the 1.19 compatibility fixes so the test suite warns which we treat as a failure. --- requirements/testing/travis_all.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/testing/travis_all.txt b/requirements/testing/travis_all.txt index 060c19517c7b..6fc4fc2de165 100644 --- a/requirements/testing/travis_all.txt +++ b/requirements/testing/travis_all.txt @@ -2,7 +2,8 @@ coverage cycler -numpy +# don't forward port this, 3.2.x warns with np 1.19 and up +numpy<1.19 pillow pyparsing pytest!=4.6.0,!=5.3.3,!=5.4.0