From 3a14a9ce6f7cf9ebcba26d17ec7bbc7140822645 Mon Sep 17 00:00:00 2001 From: Justus Magin Date: Wed, 4 Jan 2023 14:55:16 +0100 Subject: [PATCH 1/5] temporarily remove `numba` from the upstream-dev environment --- 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 bc8017523af..d2613407dd2 100755 --- a/ci/install-upstream-wheels.sh +++ b/ci/install-upstream-wheels.sh @@ -18,6 +18,8 @@ conda uninstall -y --force \ flox \ h5netcdf \ xarray +# temporarily (?) remove numbagg and numba +conda uninstall -y numbagg numba # new matplotlib dependency python -m pip install --upgrade contourpy # to limit the runtime of Upstream CI From f7df21a6ddc9046422d67f55f6d63ff06046fc71 Mon Sep 17 00:00:00 2001 From: Justus Magin Date: Wed, 4 Jan 2023 14:56:12 +0100 Subject: [PATCH 2/5] don't explicitly install the matplotlib dependency --- ci/install-upstream-wheels.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci/install-upstream-wheels.sh b/ci/install-upstream-wheels.sh index d2613407dd2..161d04806f9 100755 --- a/ci/install-upstream-wheels.sh +++ b/ci/install-upstream-wheels.sh @@ -20,8 +20,6 @@ conda uninstall -y --force \ xarray # temporarily (?) remove numbagg and numba conda uninstall -y numbagg numba -# 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 12ff948e3e1c9bebd7a1900f3b3e0a548c630eca Mon Sep 17 00:00:00 2001 From: Justus Magin Date: Wed, 4 Jan 2023 16:08:11 +0100 Subject: [PATCH 3/5] use `pip` to remove `numbagg` --- ci/install-upstream-wheels.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/install-upstream-wheels.sh b/ci/install-upstream-wheels.sh index 161d04806f9..da0905d63f1 100755 --- a/ci/install-upstream-wheels.sh +++ b/ci/install-upstream-wheels.sh @@ -19,7 +19,8 @@ conda uninstall -y --force \ h5netcdf \ xarray # temporarily (?) remove numbagg and numba -conda uninstall -y numbagg numba +pip uninstall -y numbagg +conda uninstall -y numba # to limit the runtime of Upstream CI python -m pip install \ -i https://pypi.anaconda.org/scipy-wheels-nightly/simple \ From 1cdb5977b2360b18748bbe5c94d097af7b1d0ae4 Mon Sep 17 00:00:00 2001 From: Justus Magin Date: Wed, 4 Jan 2023 16:18:36 +0100 Subject: [PATCH 4/5] [test-upstream] From 632a1130ebdbc00b86af911a898226defb8360db Mon Sep 17 00:00:00 2001 From: Justus Magin Date: Wed, 4 Jan 2023 16:24:32 +0100 Subject: [PATCH 5/5] remove `numba` and `numbagg` first [test-upstream] --- ci/install-upstream-wheels.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/install-upstream-wheels.sh b/ci/install-upstream-wheels.sh index da0905d63f1..62bf08b366f 100755 --- a/ci/install-upstream-wheels.sh +++ b/ci/install-upstream-wheels.sh @@ -1,5 +1,9 @@ #!/usr/bin/env bash +# temporarily (?) remove numbagg and numba +pip uninstall -y numbagg +conda uninstall -y numba +# forcibly remove packages to avoid artifacts conda uninstall -y --force \ numpy \ scipy \ @@ -18,9 +22,6 @@ conda uninstall -y --force \ flox \ h5netcdf \ xarray -# temporarily (?) remove numbagg and numba -pip uninstall -y numbagg -conda uninstall -y numba # to limit the runtime of Upstream CI python -m pip install \ -i https://pypi.anaconda.org/scipy-wheels-nightly/simple \