Skip to content

Commit 4c348f2

Browse files
Merge main
2 parents e4f6670 + 095de5c commit 4c348f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+549
-331
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,13 @@ jobs:
7272
7373
- name: Install zarr-python
7474
shell: "bash -l {0}"
75+
# Since zarr v3 requires numpy >= 1.25, on Python 3.11 leave it out
76+
# so we can have some tests of our minimum version of numpy (1.24)
77+
if: matrix.python-version != '3.11'
7578
run: |
7679
conda activate env
7780
# TODO: remove --pre option when zarr v3 is out
78-
python -m pip install --pre zarr
81+
python -m pip install --pre zarr>=3.0.0b2
7982
8083
# This is used to test with zfpy, which does not yet support numpy 2.0
8184
- name: Install older numpy and zfpy
@@ -97,7 +100,8 @@ jobs:
97100
conda activate env
98101
pytest -v
99102
100-
- uses: codecov/codecov-action@v4
103+
- uses: codecov/codecov-action@v5
101104
with:
105+
fail_ci_if_error: true
102106
token: ${{ secrets.CODECOV_TOKEN }}
103107
verbose: true

.github/workflows/wheel.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
submodules: true
2828

29-
- uses: pypa/cibuildwheel@v2.21.3
29+
- uses: pypa/cibuildwheel@v2.22.0
3030

3131
- uses: actions/upload-artifact@v4
3232
with:

.pre-commit-config.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
exclude: ^fixture/ # files with trailing whitespaces on purpose
22
ci:
33
autoupdate_commit_msg: "chore: update pre-commit hooks"
4+
autoupdate_schedule: "monthly"
45
autofix_commit_msg: "style: pre-commit fixes"
56
autofix_prs: false
67
default_stages: [pre-commit, pre-push]
7-
default_language_version:
8-
python: python3
98
repos:
109
- repo: https://github.com/pre-commit/pre-commit-hooks
1110
rev: v5.0.0
@@ -15,7 +14,7 @@ repos:
1514
- id: debug-statements
1615

1716
- repo: https://github.com/astral-sh/ruff-pre-commit
18-
rev: v0.7.2
17+
rev: v0.8.4
1918
hooks:
2019
- id: ruff
2120
args: ["--fix", "--show-fixes"]
@@ -25,3 +24,10 @@ repos:
2524
rev: 2024.08.19
2625
hooks:
2726
- id: sp-repo-review
27+
28+
- repo: https://github.com/pre-commit/mirrors-mypy
29+
rev: v1.14.0
30+
hooks:
31+
- id: mypy
32+
args: [--config-file, pyproject.toml]
33+
additional_dependencies: [numpy, pytest, crc32c, zfpy, 'zarr>=3.0.0b2']

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ build:
99
python: "3.12"
1010
jobs:
1111
post_install:
12-
- python -m pip install --pre 'zarr'
12+
- python -m pip install --pre 'zarr>=3.0.0b2'
1313

1414
sphinx:
1515
configuration: docs/conf.py

adhoc/blosc_memleak_check.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import sys
22

3+
import numcodecs
34
import numpy as np
45
from numpy.testing import assert_array_equal
56

6-
import numcodecs
7-
87
codec = numcodecs.Blosc()
98
data = np.arange(int(sys.argv[1]))
109
for _ in range(int(sys.argv[2])):

docs/conf.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# All configuration values have a default; values that are commented out
1313
# serve to show the default.
1414

15-
1615
import os
1716
import sys
1817
from unittest.mock import Mock as MagicMock
@@ -232,7 +231,7 @@ def __getattr__(cls, name):
232231

233232
# -- Options for LaTeX output ---------------------------------------------
234233

235-
latex_elements = {
234+
latex_elements: dict[str, str] = {
236235
# The paper size ('letterpaper' or 'a4paper').
237236
#'papersize': 'letterpaper',
238237
# The font size ('10pt', '11pt' or '12pt').

docs/contributing.rst

Lines changed: 2 additions & 2 deletions

docs/release.rst

Lines changed: 68 additions & 7 deletions

docs/zarr3.rst

Lines changed: 2 additions & 0 deletions
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"delta_encoding_order": 2,
3+
"delta_spec": "auto",
4+
"equal_pages_up_to": 262144,
5+
"id": "pcodec",
6+
"level": 8,
7+
"mode_spec": "auto",
8+
"paging_spec": "equal_pages_up_to"
9+
}

0 commit comments

Comments
 (0)