Skip to content

Commit 4967003

Browse files
authored
Merge branch 'main' into zarr-extensions
2 parents 1e50587 + 9e8b50a commit 4967003

27 files changed

+797
-150
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ contact_links:
55
about: A new major feature should be discussed in the Zarr specifications repository.
66
- name: Discuss something on ZulipChat
77
url: https://ossci.zulipchat.com/
8-
about: For questions like "How do I do X with Zarr?", you can move to our ZulipChat.
8+
about: For questions like "How do I do X with Zarr?", consider posting your question to our developer chat.
99
- name: Discuss something on GitHub Discussions
1010
url: https://github.com/zarr-developers/zarr-python/discussions
1111
about: For questions like "How do I do X with Zarr?", you can move to GitHub Discussions.

.pre-commit-config.yaml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ ci:
66
default_stages: [pre-commit, pre-push]
77
repos:
88
- repo: https://github.com/astral-sh/ruff-pre-commit
9-
rev: v0.9.4
9+
rev: v0.9.9
1010
hooks:
11-
- id: ruff
12-
args: ["--fix", "--show-fixes"]
13-
- id: ruff-format
11+
- id: ruff
12+
args: ["--fix", "--show-fixes"]
13+
- id: ruff-format
1414
- repo: https://github.com/codespell-project/codespell
1515
rev: v2.4.1
1616
hooks:
@@ -19,10 +19,10 @@ repos:
1919
- repo: https://github.com/pre-commit/pre-commit-hooks
2020
rev: v5.0.0
2121
hooks:
22-
- id: check-yaml
23-
- id: trailing-whitespace
22+
- id: check-yaml
23+
- id: trailing-whitespace
2424
- repo: https://github.com/pre-commit/mirrors-mypy
25-
rev: v1.14.1
25+
rev: v1.15.0
2626
hooks:
2727
- id: mypy
2828
files: src|tests
@@ -31,9 +31,10 @@ repos:
3131
- packaging
3232
- donfig
3333
- numcodecs[crc32c]
34-
- numpy==2.1 # until https://github.com/numpy/numpy/issues/28034 is resolved
34+
- numpy==2.1 # until https://github.com/numpy/numpy/issues/28034 is resolved
3535
- typing_extensions
3636
- universal-pathlib
37+
- obstore>=0.5.1
3738
# Tests
3839
- pytest
3940
- repo: https://github.com/scientific-python/cookie

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</td>
7171
</tr>
7272
<tr>
73-
<td>Zulip</td>
73+
<td>Developer Chat</td>
7474
<td>
7575
<a href="https://ossci.zulipchat.com/">
7676
<img src="https://img.shields.io/badge/zulip-join_chat-brightgreen.svg" />
@@ -101,13 +101,13 @@ Zarr is a Python package providing an implementation of compressed, chunked, N-d
101101

102102
## Main Features
103103

104-
- [**Create**](https://zarr.readthedocs.io/en/stable/tutorial.html#creating-an-array) N-dimensional arrays with any NumPy `dtype`.
105-
- [**Chunk arrays**](https://zarr.readthedocs.io/en/stable/tutorial.html#chunk-optimizations) along any dimension.
106-
- [**Compress**](https://zarr.readthedocs.io/en/stable/tutorial.html#compressors) and/or filter chunks using any NumCodecs codec.
107-
- [**Store arrays**](https://zarr.readthedocs.io/en/stable/tutorial.html#tutorial-storage) in memory, on disk, inside a zip file, on S3, etc...
108-
- [**Read**](https://zarr.readthedocs.io/en/stable/tutorial.html#reading-and-writing-data) an array [**concurrently**](https://zarr.readthedocs.io/en/stable/tutorial.html#parallel-computing-and-synchronization) from multiple threads or processes.
109-
- Write to an array concurrently from multiple threads or processes.
110-
- Organize arrays into hierarchies via [**groups**](https://zarr.readthedocs.io/en/stable/tutorial.html#groups).
104+
- [**Create**](https://zarr.readthedocs.io/en/stable/user-guide/arrays.html#creating-an-array) N-dimensional arrays with any NumPy `dtype`.
105+
- [**Chunk arrays**](https://zarr.readthedocs.io/en/stable/user-guide/performance.html#chunk-optimizations) along any dimension.
106+
- [**Compress**](https://zarr.readthedocs.io/en/stable/user-guide/arrays.html#compressors) and/or filter chunks using any NumCodecs codec.
107+
- [**Store arrays**](https://zarr.readthedocs.io/en/stable/user-guide/storage.html) in memory, on disk, inside a zip file, on S3, etc...
108+
- [**Read**](https://zarr.readthedocs.io/en/stable/user-guide/arrays.html#reading-and-writing-data) an array [**concurrently**](https://zarr.readthedocs.io/en/stable/user-guide/performance.html#parallel-computing-and-synchronization) from multiple threads or processes.
109+
- [**Write**](https://zarr.readthedocs.io/en/stable/user-guide/arrays.html#reading-and-writing-data) to an array concurrently from multiple threads or processes.
110+
- Organize arrays into hierarchies via [**groups**](https://zarr.readthedocs.io/en/stable/quickstart.html#hierarchical-groups).
111111

112112
## Where to get it
113113

changes/1661.feature.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add experimental ObjectStore storage class based on obstore.

changes/2665.feature.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

changes/2796.chore.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

changes/2847.fix.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

changes/2851.bugfix.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

changes/2870.bugfix.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

changes/2924.chore.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Define a new versioning policy based on Effective Effort Versioning. This replaces the old
2+
Semantic Versioning-based policy.

0 commit comments

Comments
 (0)