Skip to content

Commit 9055a1a

Browse files
authored
Merge branch 'main' into feat/numcodecs-compat
2 parents 50c6b48 + 1858af1 commit 9055a1a

Some content is hidden

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

48 files changed

+705
-169
lines changed

.github/ISSUE_TEMPLATE/release-checklist.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ assignees: ''
77

88
---
99

10-
**Release**: [v0.x.x](https://github.com/zarr-developers/zarr-python/milestones/?)
10+
**Release**: [v3.x.x](https://github.com/zarr-developers/zarr-python/milestones/?)
1111
**Scheduled Date**: 20YY/MM/DD
1212

1313
**Priority PRs/issues to complete prior to release**
@@ -16,8 +16,9 @@ assignees: ''
1616

1717
**Before release**:
1818

19+
- [ ] Make sure the release branch (e.g., `3.1.x`) is up to date with any backports.
1920
- [ ] Make sure that all pull requests which will be included in the release have been properly documented as changelog files in the [`changes/` directory](https://github.com/zarr-developers/zarr-python/tree/main/changes).
20-
- [ ] Run ``towncrier build --version x.y.z`` to create the changelog, and commit the result to the main branch.
21+
- [ ] Run ``towncrier build --version x.y.z`` to create the changelog, and commit the result to the release branch.
2122
- [ ] Check [SPEC 0](https://scientific-python.org/specs/spec-0000/#support-window) to see if the minimum supported version of Python or NumPy needs bumping.
2223
- [ ] Check to ensure that:
2324
- [ ] Deprecated workarounds/codes/tests are removed. Run `grep "# TODO" **/*.py` to find all potential TODOs.
@@ -41,6 +42,7 @@ assignees: ''
4142
- [ ] Go to https://github.com/zarr-developers/zarr-python/releases.
4243
- [ ] Click "Draft a new release".
4344
- [ ] Choose a version number prefixed with a `v` (e.g. `v0.0.0`). For pre-releases, include the appropriate suffix (e.g. `v0.0.0a1` or `v0.0.0rc2`).
45+
- [ ] Set the target branch to the release branch (e.g., `3.1.x`)
4446
- [ ] Set the description of the release to: `See release notes https://zarr.readthedocs.io/en/stable/release-notes.html#release-0-0-0`, replacing the correct version numbers. For pre-release versions, the URL should omit the pre-release suffix, e.g. "a1" or "rc1".
4547
- [ ] Click on "Generate release notes" to auto-fill the description.
4648
- [ ] Make a release by clicking the 'Publish Release' button, this will automatically create a tag too.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Check changelog entries
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
check-changelogs:
8+
name: Check changelog entries
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
13+
14+
- name: Install uv
15+
uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
16+
17+
- name: Check changelog entries
18+
run: uv run --no-sync python ci/check_changelog_entries.py

.github/workflows/gpu_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: GPU Test
55

66
on:
77
push:
8-
branches: [ main ]
8+
branches: [ main, 3.1.x ]
99
pull_request:
10-
branches: [ main ]
10+
branches: [ main, 3.1.x ]
1111
workflow_dispatch:
1212

1313
env:

.github/workflows/hypothesis.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: Slow Hypothesis CI
22
on:
33
push:
4-
branches: [main, 3.0.x]
4+
branches: [main, 3.1.x]
55
pull_request:
6-
branches: [main, 3.0.x]
6+
branches: [main, 3.1.x]
77
types: [opened, reopened, synchronize, labeled]
88
schedule:
99
- cron: "0 0 * * *" # Daily “At 00:00” UTC

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: Test
55

66
on:
77
push:
8-
branches: [ main, 3.0.x ]
8+
branches: [ main, 3.1.x ]
99
pull_request:
10-
branches: [ main, 3.0.x ]
10+
branches: [ main, 3.1.x ]
1111
workflow_dispatch:
1212

1313
concurrency:

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015-2024 Zarr Developers <https://github.com/zarr-developers>
3+
Copyright (c) 2015-2025 Zarr Developers <https://github.com/zarr-developers>
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

changes/3083.feature.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Added support for async vectorized and orthogonal indexing.
File renamed without changes.
File renamed without changes.

changes/3264.bugfix.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
- Expand the range of types accepted by ``parse_data_type`` to include strings and Sequences.
2+
- Move the functionality of ``parse_data_type`` to a new function called ``parse_dtype``. This change
3+
ensures that nomenclature is consistent across the codebase. ``parse_data_type`` remains, so this
4+
change is not breaking.

0 commit comments

Comments
 (0)