Skip to content

Commit 9acec94

Browse files
authored
Merge branch 'main' into dep/packaging
2 parents 3d74c2b + f035d45 commit 9acec94

File tree

10 files changed

+737
-127
lines changed

10 files changed

+737
-127
lines changed

docs/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
"spec/v1": 'https://zarr-specs.readthedocs.io/en/latest/v1/v1.0.html',
8888
"spec/v2": "https://zarr-specs.readthedocs.io/en/latest/v2/v2.0.html",
8989
"spec/v3": "https://zarr-specs.readthedocs.io/en/latest/v3/core/v3.0.html",
90+
"license": "https://github.com/zarr-developers/zarr-python/blob/main/LICENSE.txt"
9091
}
9192

9293
# The language for content autogenerated by Sphinx. Refer to documentation

docs/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Zarr-Python
1313
guide/index
1414
api/index
1515
release
16-
license
1716
contributing
1817
roadmap
1918

docs/license.rst

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/zarr/api/asynchronous.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -774,9 +774,9 @@ async def open_group(
774774

775775

776776
async def create(
777-
shape: ChunkCoords,
777+
shape: ChunkCoords | int,
778778
*, # Note: this is a change from v2
779-
chunks: ChunkCoords | None = None, # TODO: v2 allowed chunks=True
779+
chunks: ChunkCoords | int | None = None, # TODO: v2 allowed chunks=True
780780
dtype: npt.DTypeLike | None = None,
781781
compressor: dict[str, JSON] | None = None, # TODO: default and type change
782782
fill_value: Any | None = 0, # TODO: need type
@@ -798,7 +798,7 @@ async def create(
798798
meta_array: Any | None = None, # TODO: need type
799799
attributes: dict[str, JSON] | None = None,
800800
# v3 only
801-
chunk_shape: ChunkCoords | None = None,
801+
chunk_shape: ChunkCoords | int | None = None,
802802
chunk_key_encoding: (
803803
ChunkKeyEncoding
804804
| tuple[Literal["default"], Literal[".", "/"]]
@@ -1104,6 +1104,8 @@ async def open_array(
11041104
----------
11051105
store : Store or str
11061106
Store or path to directory in file system or name of zip file.
1107+
zarr_version : {2, 3, None}, optional
1108+
The zarr format to use when saving. Deprecated in favor of zarr_format.
11071109
zarr_format : {2, 3, None}, optional
11081110
The zarr format to use when saving.
11091111
path : str, optional

0 commit comments

Comments
 (0)