From 8483a41fe9250648330d4f28d465da94a90761cb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 Oct 2026 10:57:34 +0000 Subject: [PATCH 1/2] chore(deps): update dependency https://github.com/diamondlightsource/python-copier-template to v5.5.0 --- .copier-answers.yml | 2 +- .github/CONTRIBUTING.md | 2 +- .github/workflows/_dist.yml | 2 +- .github/workflows/_test.yml | 2 +- .github/workflows/_tox.yml | 2 +- .github/workflows/ci.yml | 3 +++ pyproject.toml | 4 ++++ 7 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index e53051e75..976843a07 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: 5.4.0 +_commit: 5.5.0 _src_path: https://github.com/DiamondLightSource/python-copier-template author_email: callum.forrester@diamond.ac.uk author_name: Callum Forrester diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index aad18495f..31f4d34f3 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.4.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 3b6d83f67..71b50aa0e 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@v10.0.0 + uses: astral-sh/setup-uv@v10.3.2 - name: Build sdist and wheel run: > diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml index 12f87e406..1ca64e4b0 100644 --- a/.github/workflows/_test.yml +++ b/.github/workflows/_test.yml @@ -33,7 +33,7 @@ jobs: run: git branch --track main origin/main - name: Install uv - uses: astral-sh/setup-uv@v10.0.0 + 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 c39bef1e6..0b44d8da6 100644 --- a/.github/workflows/_tox.yml +++ b/.github/workflows/_tox.yml @@ -15,7 +15,7 @@ jobs: uses: actions/checkout@v7 - name: Install uv - uses: astral-sh/setup-uv@v10.0.0 + uses: astral-sh/setup-uv@v10.3.2 - name: Install helm plugins run: helm plugin install --verify=false https://github.com/losisin/helm-values-schema-json.git --version 2.3.1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8da5185b5..fb7b21df4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,10 @@ on: - "*" pull_request: merge_group: +<<<<<<< before updating types: [checks_requested] +======= +>>>>>>> after updating jobs: # Check jobs skip pushes to main: merge_group already ran them on the same commit. diff --git a/pyproject.toml b/pyproject.toml index 9a97a929a..5c5008e6b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -91,6 +91,10 @@ GitHub = "https://github.com/DiamondLightSource/blueapi" email = "callum.forrester@diamond.ac.uk" name = "Callum Forrester" +[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/blueapi/_version.py" From 5af61840285fb9111daee1de9720c75474eb38d7 Mon Sep 17 00:00:00 2001 From: Zoheb Shaikh <26975142+ZohebShaikh@users.noreply.github.com> Date: Tue, 27 Oct 2026 11:15:24 +0000 Subject: [PATCH 2/2] remove conflict --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb7b21df4..8da5185b5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,10 +12,7 @@ on: - "*" pull_request: merge_group: -<<<<<<< before updating types: [checks_requested] -======= ->>>>>>> after updating jobs: # Check jobs skip pushes to main: merge_group already ran them on the same commit.