From 3bdb928e956b7943b41b2ce4c547934951561a4a Mon Sep 17 00:00:00 2001 From: Keewis Date: Wed, 8 Jun 2022 16:36:22 +0200 Subject: [PATCH 1/6] install matplotlib from pypi.anaconda.org/scipy-wheels-nightly/ --- ci/install-upstream-wheels.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ci/install-upstream-wheels.sh b/ci/install-upstream-wheels.sh index ff5615c17c6..c37506569fa 100755 --- a/ci/install-upstream-wheels.sh +++ b/ci/install-upstream-wheels.sh @@ -27,12 +27,7 @@ python -m pip install \ --upgrade \ numpy \ scipy \ - pandas -python -m pip install \ - -f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com \ - --no-deps \ - --pre \ - --upgrade \ + pandas \ matplotlib python -m pip install \ --no-deps \ From 7bffb8d11f2c6f3e61e4fc17b8fbe8b14430abcf Mon Sep 17 00:00:00 2001 From: Keewis Date: Wed, 8 Jun 2022 16:36:47 +0200 Subject: [PATCH 2/6] [skip-ci][test-upstream] From 77db66944d7b45e832bce995f9d28239a914d612 Mon Sep 17 00:00:00 2001 From: Keewis Date: Wed, 8 Jun 2022 16:48:40 +0200 Subject: [PATCH 3/6] install pytest-timeout at the end of the file [test-upstream] --- ci/install-upstream-wheels.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/install-upstream-wheels.sh b/ci/install-upstream-wheels.sh index c37506569fa..8ac3fdc1dfb 100755 --- a/ci/install-upstream-wheels.sh +++ b/ci/install-upstream-wheels.sh @@ -19,7 +19,6 @@ conda uninstall -y --force \ h5netcdf \ xarray # to limit the runtime of Upstream CI -python -m pip install pytest-timeout python -m pip install \ -i https://pypi.anaconda.org/scipy-wheels-nightly/simple \ --no-deps \ @@ -45,3 +44,4 @@ python -m pip install \ git+https://github.com/SciTools/nc-time-axis \ git+https://github.com/dcherian/flox \ git+https://github.com/h5netcdf/h5netcdf +python -m pip install pytest-timeout From 640f21ae17937f6e7b71b65869ee617b51f5a016 Mon Sep 17 00:00:00 2001 From: Keewis Date: Wed, 8 Jun 2022 16:52:56 +0200 Subject: [PATCH 4/6] install matplotlib before pandas [test-upstream] --- ci/install-upstream-wheels.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/install-upstream-wheels.sh b/ci/install-upstream-wheels.sh index 8ac3fdc1dfb..9c7a4f7521b 100755 --- a/ci/install-upstream-wheels.sh +++ b/ci/install-upstream-wheels.sh @@ -26,8 +26,8 @@ python -m pip install \ --upgrade \ numpy \ scipy \ - pandas \ - matplotlib + matplotlib \ + pandas python -m pip install \ --no-deps \ --upgrade \ From 8a1751c0fa2027b52185b8f08b967e4c47d53bdd Mon Sep 17 00:00:00 2001 From: Keewis Date: Wed, 8 Jun 2022 19:18:01 +0200 Subject: [PATCH 5/6] temporarily install contourpy This will not be necessary anymore once `matplotlib>=3.6.0` has been released. --- ci/install-upstream-wheels.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/install-upstream-wheels.sh b/ci/install-upstream-wheels.sh index 9c7a4f7521b..8a14e77b87e 100755 --- a/ci/install-upstream-wheels.sh +++ b/ci/install-upstream-wheels.sh @@ -18,6 +18,8 @@ conda uninstall -y --force \ flox \ h5netcdf \ xarray +# new matplotlib dependency +python -m pip install --upgrade contourpy # to limit the runtime of Upstream CI python -m pip install \ -i https://pypi.anaconda.org/scipy-wheels-nightly/simple \ From 90d86dab969f746137c4e451179cabe26f479a2c Mon Sep 17 00:00:00 2001 From: Keewis Date: Wed, 8 Jun 2022 19:18:56 +0200 Subject: [PATCH 6/6] [skip-ci][test-upstream]