From e8cf363565818e343a93d9e8b8eb59e918f4a07c Mon Sep 17 00:00:00 2001 From: Maximilian Roos Date: Tue, 22 Nov 2022 06:04:48 -0800 Subject: [PATCH 1/2] Add numba to nightly upstream I saw that we didn't have this while investigating https://github.com/numba/numba/issues/8615. We should probably wait until that's resolved before merging this (this doesn't solve that issue). --- ci/install-upstream-wheels.sh | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/ci/install-upstream-wheels.sh b/ci/install-upstream-wheels.sh index bc8017523af..cb04cb8c7b3 100755 --- a/ci/install-upstream-wheels.sh +++ b/ci/install-upstream-wheels.sh @@ -1,23 +1,24 @@ #!/usr/bin/env bash conda uninstall -y --force \ - numpy \ - scipy \ - pandas \ - matplotlib \ + bottleneck \ + cftime \ dask \ distributed \ + flox \ fsspec \ - zarr \ - cftime \ - rasterio \ + h5netcdf \ + matplotlib \ + numpy \ + numba \ packaging \ + pandas \ pint \ - bottleneck \ + rasterio \ + scipy \ sparse \ - flox \ - h5netcdf \ xarray + zarr \ # new matplotlib dependency python -m pip install --upgrade contourpy # to limit the runtime of Upstream CI @@ -35,15 +36,16 @@ python -m pip install \ --upgrade \ git+https://github.com/dask/dask \ git+https://github.com/dask/distributed \ - git+https://github.com/zarr-developers/zarr \ - git+https://github.com/Unidata/cftime \ - git+https://github.com/rasterio/rasterio \ - git+https://github.com/pypa/packaging \ + git+https://github.com/h5netcdf/h5netcdf git+https://github.com/hgrecco/pint \ + git+https://github.com/numba/numba \ + git+https://github.com/intake/filesystem_spec \ git+https://github.com/pydata/bottleneck \ git+https://github.com/pydata/sparse \ - git+https://github.com/intake/filesystem_spec \ + git+https://github.com/pypa/packaging \ + git+https://github.com/rasterio/rasterio \ git+https://github.com/SciTools/nc-time-axis \ + git+https://github.com/Unidata/cftime \ git+https://github.com/xarray-contrib/flox \ - git+https://github.com/h5netcdf/h5netcdf + git+https://github.com/zarr-developers/zarr \ python -m pip install pytest-timeout From b004eed1cb18179a96fe70ac56860b265e9db301 Mon Sep 17 00:00:00 2001 From: Maximilian Roos Date: Tue, 22 Nov 2022 06:05:43 -0800 Subject: [PATCH 2/2] --- 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 cb04cb8c7b3..94a2fc84e40 100755 --- a/ci/install-upstream-wheels.sh +++ b/ci/install-upstream-wheels.sh @@ -18,7 +18,7 @@ conda uninstall -y --force \ scipy \ sparse \ xarray - zarr \ + zarr # new matplotlib dependency python -m pip install --upgrade contourpy # to limit the runtime of Upstream CI @@ -47,5 +47,5 @@ python -m pip install \ git+https://github.com/SciTools/nc-time-axis \ git+https://github.com/Unidata/cftime \ git+https://github.com/xarray-contrib/flox \ - git+https://github.com/zarr-developers/zarr \ + git+https://github.com/zarr-developers/zarr python -m pip install pytest-timeout