Skip to content

Commit 2aa71d8

Browse files
1 parent cac4bfe commit 2aa71d8

13 files changed

Lines changed: 62 additions & 22 deletions

.copier-answers.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier
2-
_commit: 5.0.3
2+
_commit: 5.4.0
33
_src_path: https://github.com/DiamondLightSource/python-copier-template.git
44
author_email: n.leung@diamond.ac.uk
55
author_name: Nathanael Leung
@@ -10,7 +10,6 @@ description: Repository for useful python data analysis functions for the Diamon
1010
Imaging Group
1111
distribution_name: imaging_toolbox
1212
docker: true
13-
docker_debug: false
1413
docs_type: README
1514
git_platform: github.com
1615
github_org: DiamondLightSource

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ It is recommended that developers use a [vscode devcontainer](https://code.visua
2424

2525
This project was created using the [Diamond Light Source Copier Template](https://github.com/DiamondLightSource/python-copier-template) for Python projects.
2626

27-
For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/5.0.3/how-to.html).
27+
For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/5.4.0/how-to.html).

.github/workflows/_container.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,25 @@ jobs:
1111

1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v5
14+
uses: actions/checkout@v7
1515
with:
1616
# Need this to get version number from last tag
1717
fetch-depth: 0
1818

1919
- name: Set up Docker Buildx
2020
id: buildx
21-
uses: docker/setup-buildx-action@v3
21+
uses: docker/setup-buildx-action@v4
2222

2323
- name: Log in to GitHub Docker Registry
2424
if: github.event_name != 'pull_request'
25-
uses: docker/login-action@v3
25+
uses: docker/login-action@v4
2626
with:
2727
registry: ghcr.io
2828
username: ${{ github.actor }}
2929
password: ${{ secrets.GITHUB_TOKEN }}
3030

3131
- name: Build and export to Docker local cache
32-
uses: docker/build-push-action@v6
32+
uses: docker/build-push-action@v7
3333
env:
3434
DOCKER_BUILD_RECORD_UPLOAD: false
3535
with:
@@ -43,7 +43,7 @@ jobs:
4343

4444
- name: Create tags for publishing image
4545
id: meta
46-
uses: docker/metadata-action@v5
46+
uses: docker/metadata-action@v6
4747
with:
4848
images: ghcr.io/${{ github.repository }}
4949
tags: |
@@ -52,7 +52,7 @@ jobs:
5252
5353
- name: Push cached image to container registry
5454
if: inputs.publish && github.ref_type == 'tag'
55-
uses: docker/build-push-action@v6
55+
uses: docker/build-push-action@v7
5656
env:
5757
DOCKER_BUILD_RECORD_UPLOAD: false
5858
# This does not build the image again, it will find the image in the

.github/workflows/_dist.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ jobs:
77

88
steps:
99
- name: Checkout
10-
uses: actions/checkout@v5
10+
uses: actions/checkout@v7
1111
with:
1212
# Need this to get version number from last tag
1313
fetch-depth: 0
1414

1515
- name: Install uv
16-
uses: astral-sh/setup-uv@v7
16+
uses: astral-sh/setup-uv@v10.0.0
1717

1818
- name: Build sdist and wheel
1919
run: >
2020
export SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) &&
2121
uvx --from build pyproject-build
2222
2323
- name: Upload sdist and wheel as artifacts
24-
uses: actions/upload-artifact@v4
24+
uses: actions/upload-artifact@v7
2525
with:
2626
name: dist
2727
path: dist

.github/workflows/_pypi.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ jobs:
88

99
steps:
1010
- name: Download dist artifact
11+
<<<<<<< before updating
1112
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
13+
=======
14+
uses: actions/download-artifact@v8
15+
>>>>>>> after updating
1216
with:
1317
name: dist
1418
path: dist

.github/workflows/_release.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ jobs:
77

88
steps:
99
- name: Download artifacts
10+
<<<<<<< before updating
1011
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
12+
=======
13+
uses: actions/download-artifact@v8
14+
>>>>>>> after updating
1115
with:
1216
merge-multiple: true
1317

@@ -23,7 +27,11 @@ jobs:
2327
- name: Create GitHub Release
2428
# We pin to the SHA, not the tag, for security reasons.
2529
# https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
30+
<<<<<<< before updating
2631
uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
32+
=======
33+
uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
34+
>>>>>>> after updating
2735
with:
2836
prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }}
2937
name: ${{ github.ref_name }}

.github/workflows/_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ jobs:
2121

2222
steps:
2323
- name: Checkout
24-
uses: actions/checkout@v5
24+
uses: actions/checkout@v7
2525
with:
2626
# Need this to get version number from last tag
2727
fetch-depth: 0
2828

2929
- name: Install uv
30-
uses: astral-sh/setup-uv@v7
30+
uses: astral-sh/setup-uv@v10.0.0
3131

3232
- name: Run tests
3333
run: uv run --locked tox -e tests
3434

3535
- name: Upload coverage to Codecov
36-
uses: codecov/codecov-action@v5
36+
uses: codecov/codecov-action@v7
3737
with:
3838
name: ${{ inputs.python-version }}/${{ inputs.runs-on }}
3939
files: cov.xml

.github/workflows/_tox.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313

1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v5
16+
uses: actions/checkout@v7
1717

1818
- name: Install uv
19-
uses: astral-sh/setup-uv@v7
19+
uses: astral-sh/setup-uv@v10.0.0
2020

2121
- name: Run tox
2222
run: uv run --locked tox -e ${{ inputs.tox }}

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
matrix:
2020
runs-on: ["ubuntu-latest"] # can add windows-latest, macos-latest
21-
python-version: ["3.11", "3.12", "3.13"]
21+
python-version: ["3.11", "3.12", "3.13", "3.14"]
2222
fail-fast: false
2323
uses: ./.github/workflows/_test.yml
2424
with:

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v5.0.0
3+
rev: v6.0.0
44
hooks:
55
- id: check-added-large-files
66
exclude: ^uv.lock
@@ -32,6 +32,6 @@ repos:
3232
files: ^(uv\.lock|pyproject\.toml)$
3333

3434
- repo: https://github.com/gitleaks/gitleaks
35-
rev: v8.28.0
35+
rev: v8.30.1
3636
hooks:
3737
- id: gitleaks

0 commit comments

Comments
 (0)