From 45b05081726544e6feadfbc24d19f6a7afd3dbf4 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 7 Mar 2023 13:40:48 +0000 Subject: [PATCH 1/5] use new FSStore --- activestorage/active.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/activestorage/active.py b/activestorage/active.py index 091cd848..f3813c2c 100644 --- a/activestorage/active.py +++ b/activestorage/active.py @@ -243,8 +243,12 @@ def _get_selection(self, *args): stripped_indexer = [(a, b, c) for a,b,c in indexer] drop_axes = indexer.drop_axes # not sure what this does and why, yet. - # yes this next line is bordering on voodoo ... - fsref = self.zds.chunk_store._mutable_mapping.fs.references + # yes this next line is bordering on voodoo ... + # this returns a nested dictionary with the full file FS reference + # ie all the gubbins: chunks, data structure, types, etc + # if using zarr<=2.13.3 call with _mutable_mapping ie + # fsref = self.zds.chunk_store._mutable_mapping.fs.references + fsref = self.zds.chunk_store.fs.references return self._from_storage(stripped_indexer, drop_axes, out_shape, out_dtype, compressor, filters, missing, fsref) From f6058910963047434ef77acab5b05915efb39f92 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 7 Mar 2023 13:40:57 +0000 Subject: [PATCH 2/5] use new FSStore --- environment.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 4de2088c..2b0dc419 100644 --- a/environment.yml +++ b/environment.yml @@ -11,4 +11,6 @@ dependencies: - pip !=21.3 - pytest - xarray - - zarr <=2.13.3 # github.com/valeriupredoi/PyActiveStorage/issues/62 + # pin Zarr to avoid using old KVStore interface + # see github.com/zarr-developers/zarr-python/issues/1362 + - zarr >=2.13.6 # KVStore to FSStore From d369d9a17b4eac93c213ec91665aabe5e8aaf4d4 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 7 Mar 2023 13:41:07 +0000 Subject: [PATCH 3/5] pin Zarr to use new FSStore --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index dc758118..249ea0b7 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,8 @@ 'netcdf4', 'pytest', 'xarray', - 'zarr<=2.13.3', # github.com/valeriupredoi/PyActiveStorage/issues/62 + # pin Zarr to use new FSStore instead of KVStore + 'zarr>=2.13.3', # github.com/zarr-developers/zarr-python/issues/1362 # for testing 'pytest-cov>=2.10.1', 'pytest-xdist', From eac0151d38f9586a469fdf084dfe7e9d032abb1e Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 7 Mar 2023 13:41:51 +0000 Subject: [PATCH 4/5] run a GA test --- .github/workflows/run-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 004e2029..ecd22ca8 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - fix_Bryan_voodoo schedule: - cron: '0 0 * * *' # nightly From cb4b5262f5eb1e695733d8ace880dd9a38de568f Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 7 Mar 2023 13:49:14 +0000 Subject: [PATCH 5/5] unrun GA test --- .github/workflows/run-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index ecd22ca8..004e2029 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - fix_Bryan_voodoo schedule: - cron: '0 0 * * *' # nightly