From 6291fc13476ba4f8d7d47f142a805ade6cc4c8aa Mon Sep 17 00:00:00 2001 From: Raphael Hagen Date: Tue, 18 Jun 2024 12:37:05 -0600 Subject: [PATCH 1/5] adds kerchunk opener --- pangeo_forge_recipes/openers.py | 1 + pangeo_forge_recipes/patterns.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pangeo_forge_recipes/openers.py b/pangeo_forge_recipes/openers.py index ee444d99..1fb6d118 100644 --- a/pangeo_forge_recipes/openers.py +++ b/pangeo_forge_recipes/openers.py @@ -42,6 +42,7 @@ def open_url( FileType.zarr: dict(engine="zarr"), FileType.opendap: dict(engine="netcdf4"), FileType.grib: dict(engine="cfgrib"), + FileType.kerchunk: dict(engine="kerchunk"), } diff --git a/pangeo_forge_recipes/patterns.py b/pangeo_forge_recipes/patterns.py index 9c74c9d8..fec8310d 100644 --- a/pangeo_forge_recipes/patterns.py +++ b/pangeo_forge_recipes/patterns.py @@ -90,11 +90,12 @@ def _generate_next_value_(name, start, count, last_values): class FileType(AutoName): - unknown = auto() + grib = auto() + kerchunk = auto() netcdf3 = auto() netcdf4 = auto() - grib = auto() opendap = auto() + unknown = auto() zarr = auto() From bce73421e82fa30a7c9ff2ee3b48f0e145723258 Mon Sep 17 00:00:00 2001 From: Raphael Hagen Date: Tue, 18 Jun 2024 12:37:05 -0600 Subject: [PATCH 2/5] adds kerchunk opener --- pangeo_forge_recipes/openers.py | 1 + pangeo_forge_recipes/patterns.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pangeo_forge_recipes/openers.py b/pangeo_forge_recipes/openers.py index d419c885..5cb3536c 100644 --- a/pangeo_forge_recipes/openers.py +++ b/pangeo_forge_recipes/openers.py @@ -43,6 +43,7 @@ def open_url( FileType.zarr: dict(engine="zarr"), FileType.opendap: dict(engine="netcdf4"), FileType.grib: dict(engine="cfgrib"), + FileType.kerchunk: dict(engine="kerchunk"), } diff --git a/pangeo_forge_recipes/patterns.py b/pangeo_forge_recipes/patterns.py index 9c74c9d8..fec8310d 100644 --- a/pangeo_forge_recipes/patterns.py +++ b/pangeo_forge_recipes/patterns.py @@ -90,11 +90,12 @@ def _generate_next_value_(name, start, count, last_values): class FileType(AutoName): - unknown = auto() + grib = auto() + kerchunk = auto() netcdf3 = auto() netcdf4 = auto() - grib = auto() opendap = auto() + unknown = auto() zarr = auto() From c8d00f91f836e52aac5fb3e194d0a5a312e8a2a6 Mon Sep 17 00:00:00 2001 From: Raphael Hagen Date: Tue, 27 Aug 2024 17:04:46 -0600 Subject: [PATCH 3/5] bump --- pyproject.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f4108dff..0b638a8c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,9 @@ [build-system] -requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.0"] +requires = ["setuptools>=67.7.2", "wheel", "setuptools_scm[toml]>=6.0"] build-backend = "setuptools.build_meta" + + [project] name = "pangeo-forge-recipes" dynamic = ["version"] From afa406a4c40e81eb8f477dc601f90acc65f0bcbb Mon Sep 17 00:00:00 2001 From: Raphael Hagen Date: Tue, 27 Aug 2024 17:09:31 -0600 Subject: [PATCH 4/5] :shrug: --- .github/workflows/main.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index bb778a1f..77a29b75 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -31,13 +31,11 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - cache: pip cache-dependency-path: pyproject.toml - - name: 🎯 Check cache hit - run: echo '${{ steps.setup-python.outputs.cache-hit }}' - name: 🌈 Install pangeo-forge-recipes package shell: bash -l {0} run: | + python -m pip install --upgrade pip python -m pip install -e ".[test]" - name: 🧑‍💻 On the nightly run, test upstream dev versions if: | From 327395e3b2a218ced04d86025dc943b717d6c243 Mon Sep 17 00:00:00 2001 From: Raphael Hagen Date: Tue, 27 Aug 2024 17:15:28 -0600 Subject: [PATCH 5/5] bump beam --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0b638a8c..2644e259 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=67.7.2", "wheel", "setuptools_scm[toml]>=6.0"] +requires = ["setuptools>=67.7.2", "wheel", "setuptools_scm[toml]>=8.0"] build-backend = "setuptools.build_meta" @@ -27,7 +27,7 @@ classifiers = [ license = { text = "Apache-2.0" } keywords = ["pangeo", "data"] dependencies = [ - "apache-beam", + "apache-beam == 2.58.1 ", "cftime", "dask >= 2021.11.2", "fastparquet",