Skip to content

Commit 69366cc

Browse files
authored
Merge branch 'main' into implement_canonical_structs
2 parents c284467 + 25ee087 commit 69366cc

39 files changed

+275
-109
lines changed

.github/workflows/codspeed.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
name: CodSpeed Benchmarks
22

33
on:
4-
push:
5-
branches:
6-
- "main"
4+
schedule:
5+
- cron: '0 9 * * 1' # Every Monday at 9am UTC
76
pull_request:
8-
types: [labeled, synchronize]
9-
# `workflow_dispatch` allows CodSpeed to trigger backtest
10-
# performance analysis in order to generate initial data.
7+
types: [labeled]
118
workflow_dispatch:
129

1310
permissions:
@@ -17,15 +14,14 @@ jobs:
1714
benchmarks:
1815
name: Run benchmarks
1916
runs-on: codspeed-macro
20-
# Only run benchmarks for: pushes to main, manual triggers, or PRs with 'benchmark' label
2117
if: |
22-
github.event_name == 'push' ||
18+
github.event_name == 'schedule' ||
2319
github.event_name == 'workflow_dispatch' ||
2420
(github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark'))
2521
steps:
2622
- uses: actions/checkout@v6
2723
with:
28-
fetch-depth: 0 # grab all branches and tags
24+
fetch-depth: 0
2925
- name: Set up Python
3026
uses: actions/setup-python@v6
3127
with:

.github/workflows/releases.yml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ on:
1010
permissions:
1111
contents: read
1212

13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
1317
jobs:
1418

1519
build_artifacts:
@@ -35,7 +39,7 @@ jobs:
3539
version: '1.16.5'
3640
- name: Build wheel and sdist
3741
run: hatch build
38-
- uses: actions/upload-artifact@v6
42+
- uses: actions/upload-artifact@v7
3943
with:
4044
name: releases
4145
path: dist
@@ -55,16 +59,24 @@ jobs:
5559
ls dist
5660
5761
upload_pypi:
58-
needs: [build_artifacts]
62+
needs: [build_artifacts, test_dist_pypi]
5963
runs-on: ubuntu-latest
6064
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
65+
environment:
66+
name: releases
67+
url: https://pypi.org/p/zarr
68+
permissions:
69+
id-token: write
70+
attestations: write
71+
artifact-metadata: write
6172
steps:
6273
- uses: actions/download-artifact@v7
6374
with:
6475
name: releases
6576
path: dist
66-
- uses: pypa/gh-action-pypi-publish@v1.13.0
77+
- name: Generate artifact attestation
78+
uses: actions/attest@v4
6779
with:
68-
user: __token__
69-
password: ${{ secrets.pypi_password }}
70-
# To test: repository_url: https://test.pypi.org/legacy/
80+
subject-path: dist/*
81+
- name: Publish package to PyPI
82+
uses: pypa/gh-action-pypi-publish@v1.13.0

changes/3464.doc.md

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

changes/3562.misc.md

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

changes/3603.bugfix.md

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

changes/3605.misc.md

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

changes/3619.misc.md

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

changes/3623.misc.md

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

changes/3636.misc.md

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

changes/3648.misc.md

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

0 commit comments

Comments
 (0)