Skip to content

Commit

Permalink
Merge branch 'dev' into link_error
Browse files Browse the repository at this point in the history
  • Loading branch information
mavaylon1 authored Nov 7, 2024
2 parents 16749c9 + 3f78f9c commit ac4a22e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## 1.0.0 (Upcoming)
### Enhancements
* Added initial refactor of export, supporting references and internal/external links from Zarr to Zarr. @mavaylon1 [#194](https://github.com/hdmf-dev/hdmf-zarr/pull/194)

* Added support for Pathlib paths. @mavaylon1 [#212](https://github.com/hdmf-dev/hdmf-zarr/pull/212)

## 0.9.0 (September 16, 2024)
### Enhancements
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
11 changes: 11 additions & 0 deletions tests/unit/test_zarrio.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import shutil
import warnings
from numpy.testing import assert_array_equal
import pathlib


CUR_DIR = os.path.dirname(os.path.realpath(__file__))
Expand Down Expand Up @@ -113,6 +114,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

0 comments on commit ac4a22e

Please sign in to comment.