Skip to content

Commit

Permalink
Merge branch 'dev' into enh/add_oid_to_link_format
Browse files Browse the repository at this point in the history
  • Loading branch information
mavaylon1 authored Oct 1, 2023
2 parents 31521da + e31f6a3 commit 84240fb
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* Updated storage of references to also save the ``object_id`` and ``source_object_id``. While not strictly necessary this information is useful for validation and rigor of references. @oruebel [#57](https://github.com/hdmf-dev/hdmf-zarr/pull/57)

### New Features
* Added parallel write support for the ``ZarrIO`` for datasets wrapped with ``GenericDataChunkIterator``. @CodyCBakerPhD [#118](https://github.com/hdmf-dev/hdmf-zarr/pull/118)
* Added parallel write support for the ``ZarrIO`` for datasets wrapped with ``GenericDataChunkIterator``. @CodyCBakerPhD [#118](https://github.com/hdmf-dev/hdmf-zarr/pull/118) @oruebel [#128](https://github.com/hdmf-dev/hdmf-zarr/pull/128)

### Dependencies
* Updated HDMF and PyNWB version to the most recent release @mavaylon1 [#120](https://github.com/hdmf-dev/hdmf-zarr/pull/120)
Expand Down
12 changes: 10 additions & 2 deletions tests/unit/test_parallel_write.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,12 @@ def test_simple_tqdm(tmpdir):
display_progress=True,
)
)
dynamic_table = DynamicTable(name="TestTable", description="", columns=[column])
dynamic_table = DynamicTable(
name="TestTable",
description="",
columns=[column],
id=list(range(3)) # must provide id's when all columns are iterators
)
io.write(container=dynamic_table, number_of_jobs=number_of_jobs)

assert expected_desc in tqdm_out.getvalue()
Expand Down Expand Up @@ -222,7 +227,10 @@ def test_compound_tqdm(tmpdir):
)
)
dynamic_table = DynamicTable(
name="TestTable", description="", columns=[pickleable_column, not_pickleable_column]
name="TestTable",
description="",
columns=[pickleable_column, not_pickleable_column],
id=list(range(3)) # must provide id's when all columns are iterators
)
io.write(container=dynamic_table, number_of_jobs=number_of_jobs)

Expand Down

0 comments on commit 84240fb

Please sign in to comment.