From 30f05012ba9bdce581d2a855d2da0db8597dffc8 Mon Sep 17 00:00:00 2001 From: Deepak Cherian Date: Thu, 14 Mar 2024 22:07:58 -0600 Subject: [PATCH 1/2] [skip-ci] Fix upstream-dev env --- 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 68e841b4181..17849d4f6e4 100755 --- a/ci/install-upstream-wheels.sh +++ b/ci/install-upstream-wheels.sh @@ -3,7 +3,7 @@ # install cython for building cftime without build isolation micromamba install "cython>=0.29.20" py-cpuinfo # temporarily (?) remove numbagg and numba -micromamba remove -y numba numbagg +# micromamba remove -y numba numbagg # temporarily remove numexpr micromamba remove -y numexpr # temporarily remove backends @@ -62,6 +62,7 @@ python -m pip install \ --no-deps \ --upgrade \ git+https://github.com/dask/dask \ + git+https://github.com/dask/dask-expr \ git+https://github.com/dask/distributed \ git+https://github.com/zarr-developers/zarr \ git+https://github.com/pypa/packaging \ From aa207a9444de3fff3962db32017cbd975255d92a Mon Sep 17 00:00:00 2001 From: Deepak Cherian Date: Thu, 14 Mar 2024 22:14:45 -0600 Subject: [PATCH 2/2] [test-upstream] [skip-ci] remove numba, sparse --- .github/workflows/upstream-dev-ci.yaml | 2 +- ci/install-upstream-wheels.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml index 1aebdff0b65..872b2d865fb 100644 --- a/.github/workflows/upstream-dev-ci.yaml +++ b/.github/workflows/upstream-dev-ci.yaml @@ -52,7 +52,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.11"] + python-version: ["3.12"] steps: - uses: actions/checkout@v4 with: diff --git a/ci/install-upstream-wheels.sh b/ci/install-upstream-wheels.sh index 17849d4f6e4..d9c797e27cd 100755 --- a/ci/install-upstream-wheels.sh +++ b/ci/install-upstream-wheels.sh @@ -3,7 +3,7 @@ # install cython for building cftime without build isolation micromamba install "cython>=0.29.20" py-cpuinfo # temporarily (?) remove numbagg and numba -# micromamba remove -y numba numbagg +micromamba remove -y numba numbagg sparse # temporarily remove numexpr micromamba remove -y numexpr # temporarily remove backends @@ -67,9 +67,9 @@ python -m pip install \ git+https://github.com/zarr-developers/zarr \ git+https://github.com/pypa/packaging \ git+https://github.com/hgrecco/pint \ - git+https://github.com/pydata/sparse \ git+https://github.com/intake/filesystem_spec \ git+https://github.com/SciTools/nc-time-axis \ git+https://github.com/xarray-contrib/flox \ git+https://github.com/dgasmith/opt_einsum + # git+https://github.com/pydata/sparse # git+https://github.com/h5netcdf/h5netcdf