Skip to content

Commit 4ad7a5a

Browse files
committed
Merge branch 'main' into creation-from-other-zarr
# Conflicts: # src/zarr/core/array.py
2 parents 29074fd + fc08f31 commit 4ad7a5a

Some content is hidden

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

65 files changed

+1091
-243
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
TODO:
44
* [ ] Add unit tests and/or doctests in docstrings
55
* [ ] Add docstrings and API docs for any new/modified user-facing classes and functions
6-
* [ ] New/modified features documented in docs/tutorial.rst
7-
* [ ] Changes documented in docs/release.rst
6+
* [ ] New/modified features documented in `docs/user-guide/*.rst`
7+
* [ ] Changes documented as a new file in `changes/`
88
* [ ] GitHub Actions have all passed
99
* [ ] Test coverage is 100% (Codecov passes)

.github/dependabot.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
---
22
version: 2
33
updates:
4-
# Updates for v3 branch (the default branch)
5-
- package-ecosystem: "pip"
6-
directory: "/"
7-
schedule:
8-
interval: "daily"
9-
groups:
10-
actions:
11-
patterns:
12-
- "*"
4+
# Updates for main
135
- package-ecosystem: "github-actions"
146
directory: "/"
157
schedule:
@@ -19,19 +11,19 @@ updates:
1911
patterns:
2012
- "*"
2113

22-
# Same updates, but for main branch
14+
# Updates for support/v2 branch
2315
- package-ecosystem: "pip"
2416
directory: "/"
25-
target-branch: "main"
17+
target-branch: "support/v2"
2618
schedule:
27-
interval: "daily"
19+
interval: "weekly"
2820
groups:
2921
requirements:
3022
patterns:
3123
- "*"
3224
- package-ecosystem: "github-actions"
3325
directory: "/"
34-
target-branch: "main"
26+
target-branch: "support/v2"
3527
schedule:
3628
interval: "weekly"
3729
groups:

.github/labeler.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
needs release notes:
2-
- all: ['!docs/release.rst']
2+
- all:
3+
- changed-files:
4+
- any-glob-to-any-file: '!changes/*.rst'

.github/workflows/gpu_test.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,9 @@ jobs:
6464
- name: Run Tests
6565
run: |
6666
hatch env run --env gputest.py${{ matrix.python-version }}-${{ matrix.numpy-version }}-${{ matrix.dependency-set }} run-coverage
67+
68+
- name: Upload coverage
69+
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
70+
with:
71+
token: ${{ secrets.CODECOV_TOKEN }}
72+
verbose: true # optional (default = false)

.github/workflows/needs_release_notes.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@ on:
44
- pull_request_target
55

66
jobs:
7-
triage:
7+
labeler:
88
if: ${{ github.event.pull_request.user.login != 'dependabot[bot]' }} && ${{ github.event.pull_request.user.login != 'pre-commit-ci[bot]' }}
9+
permissions:
10+
contents: read
11+
pull-requests: write
912
runs-on: ubuntu-latest
1013
steps:
11-
- uses: actions/labeler@main
14+
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
1215
with:
1316
repo-token: ${{ secrets.GITHUB_TOKEN }}
1417
sync-labels: true

.github/workflows/releases.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
with:
5656
name: releases
5757
path: dist
58-
- uses: pypa/[email protected].3
58+
- uses: pypa/[email protected].4
5959
with:
6060
user: __token__
6161
password: ${{ secrets.pypi_password }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ src/zarr/_version.py
8383
data/*
8484
src/fixture/
8585
fixture/
86+
junit.xml
8687

8788
.DS_Store
8889
tests/.hypothesis

.pre-commit-config.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ci:
66
default_stages: [pre-commit, pre-push]
77
repos:
88
- repo: https://github.com/astral-sh/ruff-pre-commit
9-
rev: v0.8.6
9+
rev: v0.9.1
1010
hooks:
1111
- id: ruff
1212
args: ["--fix", "--show-fixes"]
@@ -49,3 +49,7 @@ repos:
4949
rev: v1.8.0
5050
hooks:
5151
- id: numpydoc-validation
52+
- repo: https://github.com/twisted/towncrier
53+
rev: 23.11.0
54+
hooks:
55+
- id: towncrier-check

.readthedocs.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ build:
44
os: ubuntu-22.04
55
tools:
66
python: "3.12"
7+
jobs:
8+
pre_build:
9+
- |
10+
if [ "$READTHEDOCS_VERSION_TYPE" != "tag" ];
11+
then
12+
towncrier build --version Unreleased --yes;
13+
fi
714
815
sphinx:
916
configuration: docs/conf.py

changes/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
!.gitignore

0 commit comments

Comments
 (0)