Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Pathlib #212

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* NWBZarrIO load_namespaces=True by default. @mavaylon1 [#204](https://github.com/hdmf-dev/hdmf-zarr/pull/204)
* Added test for opening file with consolidated metadata from DANDI. @mavaylon1 [#206](https://github.com/hdmf-dev/hdmf-zarr/pull/206)
* Add dimension labels compatible with xarray. @mavaylon1 [#207](https://github.com/hdmf-dev/hdmf-zarr/pull/207)
* Added support for Pathlib paths. @mavaylon1 [#212](https://github.com/hdmf-dev/hdmf-zarr/pull/212)

## 0.8.0 (June 4, 2024)
### Bug Fixes
Expand Down
9 changes: 7 additions & 2 deletions src/hdmf_zarr/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@
from hdmf.query import HDMFDataset
from hdmf.container import Container

from pathlib import Path


# Module variables
ROOT_NAME = 'root'
"""
Expand Down Expand Up @@ -84,7 +87,7 @@ def can_read(path):
return False

@docval({'name': 'path',
'type': (str, *SUPPORTED_ZARR_STORES),
'type': (str, Path, *SUPPORTED_ZARR_STORES),
'doc': 'the path to the Zarr file or a supported Zarr store'},
{'name': 'manager', 'type': BuildManager, 'doc': 'the BuildManager to use for I/O', 'default': None},
{'name': 'mode', 'type': str,
Expand Down Expand Up @@ -115,6 +118,8 @@ def __init__(self, **kwargs):
else:
self.__synchronizer = synchronizer
self.__mode = mode
if isinstance(path, Path):
path = str(path)
self.__path = path
self.__file = None
self.__storage_options = storage_options
Expand Down Expand Up @@ -195,7 +200,7 @@ def is_remote(self):
'type': (NamespaceCatalog, TypeMap),
'doc': 'the NamespaceCatalog or TypeMap to load namespaces into'},
{'name': 'path',
'type': (str, *SUPPORTED_ZARR_STORES),
'type': (str, Path, *SUPPORTED_ZARR_STORES),
'doc': 'the path to the Zarr file or a supported Zarr store'},
{'name': 'storage_options', 'type': dict,
'doc': 'Zarr storage options to read remote folders',
Expand Down
13 changes: 12 additions & 1 deletion tests/unit/test_zarrio.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import os
import shutil
import warnings
import pathlib


CUR_DIR = os.path.dirname(os.path.realpath(__file__))
Expand Down Expand Up @@ -136,6 +137,16 @@ def setUp(self):
self.store = [NestedDirectoryStore(p) for p in self.store_path]


#########################################
# Pathlib Tests
#########################################
class TestPathlib(BaseTestZarrWriter):
"""Test writing of builder with Zarr using a custom DirectoryStore"""
def setUp(self):
super().setUp()
self.store = pathlib.Path(self.store_path)


#########################################
# Consolidate Metadata tests
#########################################
Expand Down Expand Up @@ -195,7 +206,7 @@ class TestDimensionLabels(BuildDatasetShapeMixin):
Workflow:
i) We need to define a `get_dataset_inc_spec` to set the dim in the spec (via BuildDatasetShapeMixin)
ii) Create and write a BarDataHolder with a BarData.
iii) Read and check that the _ARRAY_DIMENSIONS attribute is set.
iii) Read and check that the _ARRAY_DIMENSIONS attribute is set.
"""
def tearDown(self):
shutil.rmtree(self.store)
Expand Down
Loading