From c1e7e6e7be60b6045e1e34c65a37850d7d260e8d Mon Sep 17 00:00:00 2001 From: Tom White Date: Thu, 19 Sep 2024 09:49:13 +0100 Subject: [PATCH 1/3] Install dask[dataframe] explicitly to fix upstream error --- .github/scripts/upstream_install.py | 2 +- requirements.txt | 2 +- setup.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/upstream_install.py b/.github/scripts/upstream_install.py index 334795790..87f989d7d 100644 --- a/.github/scripts/upstream_install.py +++ b/.github/scripts/upstream_install.py @@ -14,7 +14,7 @@ def install_deps() -> None: "--upgrade", ) upstream_deps = ( - "git+https://github.com/dask/dask.git#egg=dask[array]", + "git+https://github.com/dask/dask.git#egg=dask[array,dataframe]", "git+https://github.com/dask/distributed.git#egg=distributed", "git+https://github.com/dask/dask-ml.git#egg=dask-ml", "git+https://github.com/pandas-dev/pandas#egg=pandas", diff --git a/requirements.txt b/requirements.txt index dcc24d89b..db170a79f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ numpy < 2 xarray -dask[array] >= 2023.01.0, <= 2024.8.0 +dask[array,dataframe] >= 2023.01.0, <= 2024.8.0 distributed >= 2023.01.0, <= 2024.8.0 dask-ml scipy diff --git a/setup.cfg b/setup.cfg index 0c35d2151..481a1c928 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,7 +29,7 @@ python_requires = >=3.9 install_requires = numpy < 2 xarray - dask[array] >= 2022.01.0, <= 2024.8.0 + dask[array,dataframe] >= 2022.01.0, <= 2024.8.0 distributed >= 2022.01.0, <= 2024.8.0 dask-ml scipy From 4e235f94797cd3c7497f004372ff0537705714f5 Mon Sep 17 00:00:00 2001 From: Tom White Date: Thu, 19 Sep 2024 09:51:54 +0100 Subject: [PATCH 2/3] Temp change to run on PR --- .github/workflows/upstream.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml index c4a663137..48fd60173 100644 --- a/.github/workflows/upstream.yml +++ b/.github/workflows/upstream.yml @@ -1,6 +1,7 @@ name: Upstream on: + pull_request: push: schedule: - cron: "0 1 * * *" From 195deccfbc785dd57f981ad215cabc6c7cf92cc8 Mon Sep 17 00:00:00 2001 From: Tom White Date: Thu, 19 Sep 2024 10:10:03 +0100 Subject: [PATCH 3/3] Explicitly install Zarr main branch (v2) rather than the default (v3) --- .github/scripts/upstream_install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/upstream_install.py b/.github/scripts/upstream_install.py index 87f989d7d..5bb1c2e35 100644 --- a/.github/scripts/upstream_install.py +++ b/.github/scripts/upstream_install.py @@ -20,7 +20,7 @@ def install_deps() -> None: "git+https://github.com/pandas-dev/pandas#egg=pandas", "git+https://github.com/pangeo-data/rechunker.git#egg=rechunker", "git+https://github.com/pydata/xarray.git#egg=xarray", - "git+https://github.com/zarr-developers/zarr-python.git#egg=zarr", + "git+https://github.com/zarr-developers/zarr-python.git@main#egg=zarr", ) full_cmd_upstream = install_cmd + upstream_deps print(f"Install upstream dependencies via: {full_cmd_upstream}")