From bfcb0a7a97ee83d6fb93e67ef7a5127b59135464 Mon Sep 17 00:00:00 2001 From: Justus Magin Date: Tue, 30 Apr 2024 22:59:56 +0200 Subject: [PATCH] clean up the upstream-dev setup script (#8986) * try not to build `numcodecs` in CI [skip-ci] [skip-rtd] * don't remove `numcodecs` from the upstream-dev environment * also don't remove `pint`, it's not in the environment at the moment * [skip-ci][skip-rtd] * don't build `bottleneck` without build isolation `bottleneck` uses the release candidate on PyPI to build `numpy>=2` compatible wheels. * also build `cftime` without build isolation (same as `bottleneck`: it builds against `numpy>=2.0.0rc1`) * remove the build-deps * [skip-ci][skip-rtd] * try removing the upstream-dev build of `pyarrow` [skip-ci][skip-rtd] Supposedly `pyarrow>=16.0` is compatible with `numpy>=2`, but I don't know whether the version on `conda-forge` is built against the release candidate of `numpy`. * Revert "try removing the upstream-dev build of `pyarrow`" [skip-ci][skip-rtd] This reverts commit 48a656f0ead2271446c7e56a699782f3d91fe169. --- ci/install-upstream-wheels.sh | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/ci/install-upstream-wheels.sh b/ci/install-upstream-wheels.sh index af4b68b0d9b..fc19516f480 100755 --- a/ci/install-upstream-wheels.sh +++ b/ci/install-upstream-wheels.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -# install cython for building cftime without build isolation -micromamba install "cython>=0.29.20" py-cpuinfo setuptools-scm # temporarily (?) remove numbagg and numba micromamba remove -y numba numbagg sparse # temporarily remove numexpr @@ -18,10 +16,9 @@ micromamba remove -y --force \ zarr \ cftime \ packaging \ - pint \ bottleneck \ - flox \ - numcodecs + flox + # pint # to limit the runtime of Upstream CI python -m pip install \ -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \ @@ -42,23 +39,6 @@ python -m pip install \ --pre \ --upgrade \ pyarrow -# without build isolation for packages compiling against numpy -# TODO: remove once there are `numpy>=2.0` builds for these -python -m pip install \ - --no-deps \ - --upgrade \ - --no-build-isolation \ - git+https://github.com/Unidata/cftime -python -m pip install \ - --no-deps \ - --upgrade \ - --no-build-isolation \ - git+https://github.com/zarr-developers/numcodecs -python -m pip install \ - --no-deps \ - --upgrade \ - --no-build-isolation \ - git+https://github.com/pydata/bottleneck python -m pip install \ --no-deps \ --upgrade \ @@ -66,8 +46,10 @@ python -m pip install \ git+https://github.com/dask/dask-expr \ git+https://github.com/dask/distributed \ git+https://github.com/zarr-developers/zarr \ + git+https://github.com/Unidata/cftime \ git+https://github.com/pypa/packaging \ git+https://github.com/hgrecco/pint \ + git+https://github.com/pydata/bottleneck \ git+https://github.com/intake/filesystem_spec \ git+https://github.com/SciTools/nc-time-axis \ git+https://github.com/xarray-contrib/flox \