From e86eb71bb1908bb7f912aa20b43f181be69db614 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 14 Aug 2026 22:10:51 +0000
Subject: [PATCH] chore(deps): update dependency
 https://github.com/diamondlightsource/python-copier-template to v5.4.0

---
 .copier-answers.yml         |  2 +-
 .github/CONTRIBUTING.md     |  2 +-
 .github/workflows/_dist.yml |  2 +-
 .github/workflows/_test.yml |  2 +-
 .github/workflows/_tox.yml  |  2 +-
 pyproject.toml              |  3 +++
 renovate.json               | 11 +++++++++++
 7 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/.copier-answers.yml b/.copier-answers.yml
index 9e3d252240..e53051e759 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.4.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 ca7c2fb0d2..aad18495fa 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.4.0/how-to.html).
diff --git a/.github/workflows/_dist.yml b/.github/workflows/_dist.yml
index 0d163c8e26..3b6d83f67e 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.0.0
 
       - name: Build sdist and wheel
         run: >
diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml
index b0a0e01d59..fc381e0c56 100644
--- a/.github/workflows/_test.yml
+++ b/.github/workflows/_test.yml
@@ -32,7 +32,7 @@ jobs:
         run: git branch --track main origin/main
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v8.3.2
+        uses: astral-sh/setup-uv@v10.0.0
 
       - name: Run tests
         run: uv run --locked tox -e tests
diff --git a/.github/workflows/_tox.yml b/.github/workflows/_tox.yml
index 356e8dd3ae..afa9c6f65b 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@v8.3.2
+        uses: astral-sh/setup-uv@v10.0.0
 
       - name: Install helm plugins
         run: helm plugin install https://github.com/losisin/helm-values-schema-json.git --version 2.3.1
diff --git a/pyproject.toml b/pyproject.toml
index 9ef88de3a3..69a7af047b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,9 +48,12 @@ demo = ["dls-dodal>=1.69.0", "ophyd-async[sim]"]
 
 [dependency-groups]
 dev = [
+<<<<<<< before updating
     "ophyd_async[sim]",
     "copier",
     "dls-dodal>=1.69.0",
+=======
+>>>>>>> after updating
     "myst-parser",
     "prek",
     "pydata-sphinx-theme>=0.15.4",
diff --git a/renovate.json b/renovate.json
index 7a40c6abb5..157683bb4c 100644
--- a/renovate.json
+++ b/renovate.json
@@ -36,6 +36,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
     }
   ]
 }