From 9c9060fb43add55e072dd535cae39bdd0fe24562 Mon Sep 17 00:00:00 2001 From: Ollie Copping Date: Tue, 18 Aug 2026 08:14:03 +0000 Subject: [PATCH] Update template to 5.4.0 --- .copier-answers.yml | 2 +- .github/CONTRIBUTING.md | 2 +- .github/workflows/_dist.yml | 4 ++-- .github/workflows/_release.yml | 2 +- .github/workflows/_test.yml | 6 +++--- .github/workflows/_tox.yml | 4 ++-- .pre-commit-config.yaml | 2 +- renovate.json | 11 +++++++++++ 8 files changed, 22 insertions(+), 11 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index fda48ae9..b87b3bdc 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: 5.2.0 +_commit: 5.4.0 _src_path: gh:DiamondLightSource/python-copier-template author_email: oliver.copping@diamond.ac.uk author_name: Oliver Copping diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0207ff51..0f5ff009 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -24,4 +24,4 @@ It is recommended that developers use a [vscode devcontainer](https://code.visua This project was created using the [Diamond Light Source Copier Template](https://github.com/DiamondLightSource/python-copier-template) for Python projects. -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.2.0/how-to.html). +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). diff --git a/.github/workflows/_dist.yml b/.github/workflows/_dist.yml index 3d120339..955b4aec 100644 --- a/.github/workflows/_dist.yml +++ b/.github/workflows/_dist.yml @@ -7,7 +7,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: # Need this to get version number from last tag fetch-depth: 0 @@ -22,7 +22,7 @@ jobs: uvx --from build pyproject-build - name: Install uv - uses: astral-sh/setup-uv@v7 + uses: astral-sh/setup-uv@v10.0.0 - name: Build sdist and wheel run: > diff --git a/.github/workflows/_release.yml b/.github/workflows/_release.yml index eeeedb03..4713aeee 100644 --- a/.github/workflows/_release.yml +++ b/.github/workflows/_release.yml @@ -36,7 +36,7 @@ jobs: - name: Create GitHub Release # We pin to the SHA, not the tag, for security reasons. # https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions - uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0 + uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2 with: prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }} files: | diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml index 2560c98f..d58c2e9c 100644 --- a/.github/workflows/_test.yml +++ b/.github/workflows/_test.yml @@ -21,20 +21,20 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: # Need this to get version number from last tag fetch-depth: 0 submodules: recursive - name: Install uv - uses: astral-sh/setup-uv@v7 + uses: astral-sh/setup-uv@v10.0.0 - name: Run tests run: uv run --locked tox -e tests - name: Upload coverage to Codecov - uses: codecov/codecov-action@v6 + uses: codecov/codecov-action@v7 with: name: ${{ inputs.python-version }}/${{ inputs.runs-on }} files: cov.xml diff --git a/.github/workflows/_tox.yml b/.github/workflows/_tox.yml index a8f5ad7a..e7abe84c 100644 --- a/.github/workflows/_tox.yml +++ b/.github/workflows/_tox.yml @@ -13,10 +13,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Install uv - uses: astral-sh/setup-uv@v7 + uses: astral-sh/setup-uv@v10.0.0 - name: Run tox run: uv run --locked tox -e ${{ inputs.tox }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 09a2aa6f..10d74156 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -32,6 +32,6 @@ repos: files: ^(uv\.lock|pyproject\.toml)$ - repo: https://github.com/gitleaks/gitleaks - rev: v8.28.0 + rev: v8.30.1 hooks: - id: gitleaks diff --git a/renovate.json b/renovate.json index e7792a2e..f17c9011 100644 --- a/renovate.json +++ b/renovate.json @@ -31,6 +31,17 @@ "github-actions" ], "enabled": false + }, + { + "description": "Disable Dockerfile base images that are managed by python-copier-template", + "matchManagers": [ + "dockerfile" + ], + "matchDepNames": [ + "ubuntu", + "ghcr.io/diamondlightsource/ubuntu-devcontainer" + ], + "enabled": false } ] }