8000 update store path · zarr-developers/zarr-python@c2379a1 · GitHub
[go: up one dir, main page]

Skip to content

Commit c2379a1

Browse files
committed
update store path
1 parent fdb7461 commit c2379a1

File tree

2 files changed

+23
-19
li 8000 nes changed

2 files changed

+23
-19
lines changed

src/zarr/core/group.py

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -706,46 +706,40 @@ async def tree(self, expand: bool = False, level: int | None = None) -> Any:
706706
raise NotImplementedError
707707

708708
async def empty(self, *, name: str, shape: ChunkCoords, **kwargs: Any) -> AsyncArray:
709-
path = str(self.store_path / name)
710-
return await async_api.empty(shape=shape, path=path, **kwargs)
709+
return await async_api.empty(shape=shape, store=self.store_path, path=name, **kwargs)
711710

712711
async def zeros(self, *, name: str, shape: ChunkCoords, **kwargs: Any) -> AsyncArray:
713-
path = str(self.store_path / name)
714-
return await async_api.zeros(shape=shape, path=path, **kwargs)
712+
return await async_api.zeros(shape=shape, store=self.store_path, path=name, **kwargs)
715713

716714
async def ones(self, *, name: str, shape: ChunkCoords, **kwargs: Any) -> AsyncArray:
717-
path = str(self.store_path / name)
718-
return await async_api.ones(shape=shape, path=path, **kwargs)
715+
return await async_api.ones(shape=shape, store=self.store_path, path=name, **kwargs)
719716

720717
async def full(
721718
self, *, name: str, shape: ChunkCoords, fill_value: Any | None, **kwargs: Any
722719
) -> AsyncArray:
723-
path = str(self.store_path / name)
724-
return await async_api.full(shape=shape, fill_value=fill_value, path=path, **kwargs)
720+
return await async_api.full(
721+
shape=shape, fill_value=fill_value, store=self.store_path, path=name, **kwargs
722+
)
725723

726724
async def empty_like(
727725
self, *, name: str, prototype: async_api.ArrayLike, **kwargs: Any
728726
) -> AsyncArray:
729-
path = str(self.store_path / name)
730-
return await async_api.empty_like(a=prototype, path=path, **kwargs)
727+
return await async_api.empty_like(a=prototype, store=self.store_path, path=name, **kwargs)
731728

732729
async def zeros_like(
733730
self, *, name: str, prototype: async_api.ArrayLike, **kwargs: Any
734731
) -> AsyncArray:
735-
path = str(self.store_path / name)
736-
return await async_api.zeros_like(a=prototype, path=path, **kwargs)
732+
return await async_api.zeros_like(a=prototype, store=self.store_path, path=name, **kwargs)
737733

738734
async def ones_like(
739735
self, *, name: str, prototype: async_api.ArrayLike, **kwargs: Any
740736
) -> AsyncArray:
741-
path = str(self.store_path / name)
742-
return await async_api.ones_like(a=prototype, path=path, **kwargs)
737+
return await async_api.ones_like(a=prototype, store=self.store_path, path=name, **kwargs)
743738

744739
async def full_like(
745740
self, *, name: str, prototype: async_api.ArrayLike, **kwargs: Any
746741
) -> AsyncArray:
747-
path = str(self.store_path / name)
748-
return await async_api.full_like(a=prototype, path=path, **kwargs)
742+
return await async_api.full_like(a=prototype, store=self.store_path, path=name, **kwargs)
749743

750744
async def move(self, source: str, dest: str) -> None:
751745
raise NotImplementedError

tests/v3/test_group.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -400,51 +400,61 @@ def test_group_array_creation(
400400
assert isinstance(empty_array, Array)
401401
assert empty_array.fill_value == 0
402402
assert empty_array.shape == shape
403+
assert empty_array.store_path.store == store
403404

404405
empty_like_array = group.empty_like(name="empty_like", prototype=empty_array)
405406
assert isinstance(empty_like_array, Array)
406407
assert empty_like_array.fill_value == 0
407408
assert empty_like_array.shape == shape
409+
assert empty_like_array.store_path.store == store
408410

409411
empty_array_bool = group.empty(name="empty_bool", shape=shape, dtype=np.dtype("bool"))
410412
assert isinstance(empty_array_bool, Array)
411413
assert not empty_array_bool.fill_value
412-
assert empty_array.shape == shape
414+
assert empty_array_bool.shape == shape
415+
assert empty_array_bool.store_path.store == store
413416

414417
empty_like_array_bool = group.empty_like(name="empty_like_bool", prototype=empty_array_bool)
415418
assert isinstance(empty_like_array_bool, Array)
416419
assert not empty_like_array_bool.fill_value
417-
assert empty_like_array.shape == shape
420+
assert empty_like_array_bool.shape == shape
421+
assert empty_like_array_bool.store_path.store == store
418422

419423
zeros_array = group.zeros(name="zeros", shape=shape)
420424
assert isinstance(zeros_array, Array)
421425
assert zeros_array.fill_value == 0
422426
assert zeros_array.shape == shape
427+
assert zeros_array.store_path.store == store
423428

424429
zeros_like_array = group.zeros_like(name="zeros_like", prototype=zeros_array)
425430
assert isinstance(zeros_like_array, Array)
426431
assert zeros_like_array.fill_value == 0
427432
assert zeros_like_array.shape == shape
433+
assert zeros_like_array.store_path.store == store
428434

429435
ones_array = group.ones(name="ones", shape=shape)
430436
assert isinstance(ones_array, Array)
431437
assert ones_array.fill_value == 1
432438
assert ones_array.shape == shape
439+
assert ones_array.store_path.store == store
433440

434-
ones_like_array = group.ones_like(name="ones", prototype=ones_array)
441+
ones_like_array = group.ones_like(name="ones_like", prototype=ones_array)
435 9EE9 442
assert isinstance(ones_like_array, Array)
436443
assert ones_like_array.fill_value == 1
437444
assert ones_like_array.shape == shape
445+
assert ones_like_array.store_path.store == store
438446

439447
full_array = group.full(name="full", shape=shape, fill_value=42)
440448
assert isinstance(full_array, Array)
441449
assert full_array.fill_value == 42
442450
assert full_array.shape == shape
451+
assert full_array.store_path.store == store
443452

444453
full_like_array = group.full_like(name="full_like", prototype=full_array, fill_value=43)
445454
assert isinstance(full_like_array, Array)
446455
assert full_like_array.fill_value == 43
447456
assert full_like_array.shape == shape
457+
assert full_like_array.store_path.store == store
448458

449459

450460
@pytest.mark.parametrize("store", ("local", "memory", "zip"), indirect=["store"])

0 commit comments

Comments
 (0)
0