Skip to content

Commit

Permalink
prevent generator
Browse files Browse the repository at this point in the history
  • Loading branch information
veenstrajelmer authored Aug 14, 2024
1 parent ae61262 commit 946ae02
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion tests/test_partitioning.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def test_partition_roundtrip(self):
def test_merge_partitions__errors(self):
partitions = self.uds.ugrid.partition(n_part=2)
with pytest.raises(TypeError, match="Expected UgridDataArray or UgridDataset"):
pt.merge_partitions(p.ugrid.obj for p in partitions)
pt.merge_partitions([p.ugrid.obj for p in partitions])

grid1 = partitions[1].ugrid.grid
partitions[1]["extra"] = (grid1.face_dimension, np.ones(grid1.n_face))
Expand Down
4 changes: 2 additions & 2 deletions xugrid/ugrid/partitioning.py
Original file line number Diff line number Diff line change
Expand Up @@ -328,10 +328,10 @@ def merge_partitions(partitions, merge_ugrid_chunks: bool = True):
-------
merged : UgridDataset
"""
if len(partitions) == 0:
raise ValueError("Cannot merge partitions: zero partitions provided.")
types = {type(obj) for obj in partitions}
msg = "Expected UgridDataArray or UgridDataset, received: {}"
if len(types) == 0:
raise ValueError("Cannot merge partitions: zero partitions provided.")
if len(types) > 1:
type_names = [t.__name__ for t in types]
raise TypeError(msg.format(type_names))
Expand Down

0 comments on commit 946ae02

Please sign in to comment.