From fc8a85f73a893c169eb1dfdfdd8ee7b40bd7f033 Mon Sep 17 00:00:00 2001 From: Sam Evans <47793072+Sevans711@users.noreply.github.com> Date: Thu, 24 Sep 2026 08:41:58 -0400 Subject: [PATCH 1/4] test more packages' latest builds in upstream ci --- ci/install-upstream.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/ci/install-upstream.sh b/ci/install-upstream.sh index 0c9f4c7a9..e0e8ffb47 100644 --- a/ci/install-upstream.sh +++ b/ci/install-upstream.sh @@ -3,20 +3,28 @@ # forcibly remove packages to avoid artifacts conda remove -y --force \ + antimeridian \ cartopy \ dask \ datashader \ distributed \ + matplotlib \ holoviews \ + hvplot \ + geoviews \ pandas \ + pyarrow \ + requests \ scikit-learn \ scipy \ shapely \ + spatialpandas \ xarray +# any packages whose latest versions are being tested here but +# which do not appear during `conda list` from running upstream-dev-ci.yml: pip uninstall -y \ - antimeridian \ - spatialpandas + pooch # conda list conda list @@ -32,6 +40,8 @@ python -m pip install \ --no-deps \ --pre \ --upgrade \ + matplotlib \ + pyarrow \ scikit-learn \ scipy \ xarray @@ -46,7 +56,12 @@ python -m pip install \ git+https://github.com/holoviz/datashader.git \ git+https://github.com/dask/dask.git \ git+https://github.com/dask/distributed.git \ + git+https://github.com/fatiando/pooch.git \ + git+https://github.com/pola-rs/polars.git \ git+https://github.com/holoviz/holoviews.git \ + git+https://github.com/holoviz/hvplot.git \ + git+https://github.com/holoviz/geoviews.git \ + git+https://github.com/psf/requests.git \ git+https://github.com/shapely/shapely.git \ git+https://github.com/holoviz/spatialpandas.git \ 'geopandas>=1.0.0' From 0a86fd2dac4fe7853a61b554b5a46f093ee3d928 Mon Sep 17 00:00:00 2001 From: Sam Evans <47793072+Sevans711@users.noreply.github.com> Date: Thu, 24 Sep 2026 09:20:09 -0400 Subject: [PATCH 2/4] upstream ci polars - just use stable release polars latest build is hard to get working properly because it isn't a pure python package. Minimal effort solution is to just stick with stable release for now. Can revisit later if there's a more compelling reason to add it into uxarray upstream ci. --- ci/install-upstream.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/install-upstream.sh b/ci/install-upstream.sh index e0e8ffb47..4f30de097 100644 --- a/ci/install-upstream.sh +++ b/ci/install-upstream.sh @@ -57,7 +57,6 @@ python -m pip install \ git+https://github.com/dask/dask.git \ git+https://github.com/dask/distributed.git \ git+https://github.com/fatiando/pooch.git \ - git+https://github.com/pola-rs/polars.git \ git+https://github.com/holoviz/holoviews.git \ git+https://github.com/holoviz/hvplot.git \ git+https://github.com/holoviz/geoviews.git \ From 1ab563365445d6efa781e2d6a15db59e078d343a Mon Sep 17 00:00:00 2001 From: Sam Evans <47793072+Sevans711@users.noreply.github.com> Date: Tue, 29 Sep 2026 09:50:24 -0400 Subject: [PATCH 3/4] fix install-upstream.sh package removal bugs matplotlib is spelled as matplotlib-base and matplotlib-inline for conda pooch exists in the first conda list from upstream-dev-ci.yml so it can be uninstalled via conda remove. (It was missing from the second conda list, which is what led to this originally.) Kept the related comment for future reference. --- ci/install-upstream.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ci/install-upstream.sh b/ci/install-upstream.sh index 4f30de097..c37a3a28a 100644 --- a/ci/install-upstream.sh +++ b/ci/install-upstream.sh @@ -8,11 +8,13 @@ conda remove -y --force \ dask \ datashader \ distributed \ - matplotlib \ + matplotlib-base \ + matplotlib-inline \ holoviews \ hvplot \ geoviews \ pandas \ + pooch \ pyarrow \ requests \ scikit-learn \ @@ -21,10 +23,12 @@ conda remove -y --force \ spatialpandas \ xarray -# any packages whose latest versions are being tested here but -# which do not appear during `conda list` from running upstream-dev-ci.yml: -pip uninstall -y \ - pooch +# solution for any packages whose latest versions are being tested here but +# which do not appear during (the first!) `conda list` from upstream-dev-ci.yml +# (currently there are none; just keeping this comment for future reference.) +# pip uninstall -y \ + # package1_not_in_conda_list + # package2_not_in_conda_list # conda list conda list From 12cc26a3e099eed0fdaea2e693443bce061a756b Mon Sep 17 00:00:00 2001 From: Sam Evans <47793072+Sevans711@users.noreply.github.com> Date: Tue, 6 Oct 2026 10:50:29 -0400 Subject: [PATCH 4/4] set -e in install-upstream.sh --- ci/install-upstream.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/install-upstream.sh b/ci/install-upstream.sh index c37a3a28a..5d4c97414 100644 --- a/ci/install-upstream.sh +++ b/ci/install-upstream.sh @@ -1,6 +1,10 @@ #!/usr/bin/env bash # adapted from https://github.com/pydata/xarray/blob/main/ci/install-upstream-wheels.sh +# fail the job if anything goes wrong (e.g. if `conda remove ...` fails) +# instead of silently continuing. +set -e + # forcibly remove packages to avoid artifacts conda remove -y --force \ antimeridian \