From eb0e3d754f8d66f67c4dfe1aca9820c1816fe9c1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 Oct 2026 19:58:28 +0000 Subject: [PATCH] Update dependency https://github.com/DiamondLightSource/python-copier-template.git to v5.5.0 --- .copier-answers.yml | 2 +- .github/CONTRIBUTING.md | 2 +- .github/workflows/_dist.yml | 2 +- .github/workflows/_release.yml | 2 +- .github/workflows/_test.yml | 2 +- .github/workflows/_tox.yml | 2 +- .github/workflows/ci.yml | 1 + pyproject.toml | 5 ++++- renovate.json | 11 +++++++++++ 9 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 27460e9..7dbf201 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: 5.3.0 +_commit: 5.5.0 _src_path: https://github.com/DiamondLightSource/python-copier-template.git author_email: tim.burd@diamond.ac.uk author_name: Timothy Burd diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e5718cb..0ea4aed 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.3.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.5.0/how-to.html). diff --git a/.github/workflows/_dist.yml b/.github/workflows/_dist.yml index 0d163c8..71b50aa 100644 --- a/.github/workflows/_dist.yml +++ b/.github/workflows/_dist.yml @@ -13,7 +13,7 @@ jobs: fetch-depth: 0 - name: Install uv - uses: astral-sh/setup-uv@v8.3.2 + uses: astral-sh/setup-uv@v10.3.2 - name: Build sdist and wheel run: > diff --git a/.github/workflows/_release.yml b/.github/workflows/_release.yml index 14b4b26..59b9292 100644 --- a/.github/workflows/_release.yml +++ b/.github/workflows/_release.yml @@ -23,7 +23,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@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2 + uses: softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v3.0.3 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 366ec47..b563e8b 100644 --- a/.github/workflows/_test.yml +++ b/.github/workflows/_test.yml @@ -27,7 +27,7 @@ jobs: fetch-depth: 0 - name: Install uv - uses: astral-sh/setup-uv@v8.3.2 + uses: astral-sh/setup-uv@v10.3.2 - name: Run tests run: uv run --locked tox -e tests diff --git a/.github/workflows/_tox.yml b/.github/workflows/_tox.yml index 2a3c4bb..c259f52 100644 --- a/.github/workflows/_tox.yml +++ b/.github/workflows/_tox.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v7 - name: Install uv - uses: astral-sh/setup-uv@v8.3.2 + uses: astral-sh/setup-uv@v10.3.2 - name: Run tox run: uv run --locked tox -e ${{ inputs.tox }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a318365..fb4d8de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,6 +7,7 @@ on: tags: - '*' pull_request: + merge_group: jobs: diff --git a/pyproject.toml b/pyproject.toml index 0e57afd..1137e84 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,6 @@ requires-python = ">=3.11" [dependency-groups] dev = [ - "copier", "pre-commit", "pyright", "pytest", @@ -46,6 +45,10 @@ GitHub = "https://github.com/DiamondLightSource/pssAutoDial" email = "tim.burd@diamond.ac.uk" name = "Timothy Burd" +[tool.uv] +# Minimum uv to fix eMudhra CA cert incident (see discuss.python.org/t/109576) +required-version = ">=0.13.5" + [tool.setuptools_scm] version_file = "src/pss_autodial/_version.py" diff --git a/renovate.json b/renovate.json index 9f40897..777b6f1 100644 --- a/renovate.json +++ b/renovate.json @@ -34,6 +34,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 } ] }