From 074e3e60848feb552058007ea4164620e16b8a01 Mon Sep 17 00:00:00 2001 From: Pascal Bourgault Date: Wed, 19 Oct 2022 12:06:12 -0400 Subject: [PATCH 1/4] Fix #540 Cast paths to string before passing to fsspec. --- intake_esm/cat.py | 1 + 1 file changed, 1 insertion(+) diff --git a/intake_esm/cat.py b/intake_esm/cat.py index a4542eca..8df7f6e2 100644 --- a/intake_esm/cat.py +++ b/intake_esm/cat.py @@ -246,6 +246,7 @@ def load( """ storage_options = storage_options if storage_options is not None else {} read_csv_kwargs = read_csv_kwargs or {} + json_file = str(json_file) # We accept Path, but fsspec doesn't. _mapper = fsspec.get_mapper(json_file, **storage_options) with fsspec.open(json_file, **storage_options) as fobj: From 2cfd951c6033d2eb7fbafdc7189a69638de9635c Mon Sep 17 00:00:00 2001 From: Anderson Banihirwe Date: Wed, 19 Oct 2022 12:23:01 -0600 Subject: [PATCH 2/4] Trigger CI From 57468d10752fda4ff83ab2a5184b628ee2de3bec Mon Sep 17 00:00:00 2001 From: Anderson Banihirwe Date: Wed, 19 Oct 2022 12:53:54 -0600 Subject: [PATCH 3/4] Fix CI: Pin minimum s3fs version --- ci/environment-docs.yml | 2 +- ci/environment.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/environment-docs.yml b/ci/environment-docs.yml index b63763a7..6facb79b 100644 --- a/ci/environment-docs.yml +++ b/ci/environment-docs.yml @@ -16,7 +16,7 @@ dependencies: - pydantic>=1.9 - python-graphviz - python=3.10 - - s3fs + - s3fs >=2022.8.2 - sphinx - sphinx-copybutton - sphinx-design diff --git a/ci/environment.yml b/ci/environment.yml index 295b0cbe..ca8ea426 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -22,7 +22,7 @@ dependencies: - pytest-sugar - pytest-xdist - pytest-mock - - s3fs + - s3fs >=2022.8.2 - scipy - xarray>=2022.06 - xarray-datatree From 64bb9294f89d0db0fc9ddde05de822d213b46fce Mon Sep 17 00:00:00 2001 From: mgrover1 Date: Wed, 16 Nov 2022 13:45:44 -0600 Subject: [PATCH 4/4] ensure single threaded dask --- tests/test_core.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/test_core.py b/tests/test_core.py index 1e103858..4df33013 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -1,6 +1,7 @@ import ast import os +import dask import intake import pandas as pd import pydantic @@ -10,6 +11,9 @@ import intake_esm +dask.config.set(scheduler='single-threaded') + + registry = intake_esm.DerivedVariableRegistry()