From 352000488b79a49de1e94aaadbb2ec0f06b923c5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Jul 2026 13:18:37 +0000 Subject: [PATCH] chore(deps): update dependency https://github.com/diamondlightsource/python-copier-template to v5.3.0 --- .copier-answers.yml | 3 +-- .github/CONTRIBUTING.md | 2 +- .github/workflows/_container.yml | 23 ++++++++++++++++++++++- .github/workflows/_dist.yml | 8 ++++++-- .github/workflows/_docs.yml | 10 +++++++--- .github/workflows/_pypi.yml | 2 +- .github/workflows/_release.yml | 4 ++-- .github/workflows/_test.yml | 8 ++++++-- .github/workflows/_tox.yml | 4 ++-- Dockerfile | 3 +++ 10 files changed, 51 insertions(+), 16 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 856234853d..9e3d252240 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.3.0 _src_path: https://github.com/DiamondLightSource/python-copier-template author_email: callum.forrester@diamond.ac.uk author_name: Callum Forrester @@ -10,7 +10,6 @@ description: Lightweight bluesky-as-a-service wrapper application. Also usable a a library. distribution_name: blueapi docker: true -docker_debug: false docs_type: sphinx git_platform: github.com github_org: DiamondLightSource diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0c6b60c41a..ca7c2fb0d2 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.3.0/how-to.html). diff --git a/.github/workflows/_container.yml b/.github/workflows/_container.yml index d27b67ef91..e9ec4fa71d 100644 --- a/.github/workflows/_container.yml +++ b/.github/workflows/_container.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v7 with: # Need this to get version number from last tag fetch-depth: 0 @@ -32,18 +32,30 @@ jobs: fi - name: Set up Docker Buildx id: buildx +<<<<<<< before updating uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3 - name: Log in to GitHub Docker Registry if: github.event_name != 'pull_request' uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3 +======= + uses: docker/setup-buildx-action@v4 + + - name: Log in to GitHub Docker Registry + if: github.event_name != 'pull_request' + uses: docker/login-action@v4 +>>>>>>> after updating with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and export to Docker local cache +<<<<<<< before updating uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6 +======= + uses: docker/build-push-action@v7 +>>>>>>> after updating env: DOCKER_BUILD_RECORD_UPLOAD: false with: @@ -57,7 +69,11 @@ jobs: - name: Create tags for publishing image id: meta +<<<<<<< before updating uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5 +======= + uses: docker/metadata-action@v6 +>>>>>>> after updating with: images: ghcr.io/${{ github.repository }} tags: | @@ -65,8 +81,13 @@ jobs: type=raw,value=latest - name: Push cached image to container registry +<<<<<<< before updating if: github.ref_type == 'tag' uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6 +======= + if: inputs.publish && github.ref_type == 'tag' + uses: docker/build-push-action@v7 +>>>>>>> after updating env: DOCKER_BUILD_RECORD_UPLOAD: false # This does not build the image again, it will find the image in the diff --git a/.github/workflows/_dist.yml b/.github/workflows/_dist.yml index cbafb68214..64e9973123 100644 --- a/.github/workflows/_dist.yml +++ b/.github/workflows/_dist.yml @@ -7,13 +7,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v7 with: # Need this to get version number from last tag fetch-depth: 0 - name: Install uv - uses: astral-sh/setup-uv@v7 + uses: astral-sh/setup-uv@v8.3.2 - name: Build sdist and wheel run: > @@ -21,7 +21,11 @@ jobs: uvx --from build pyproject-build - name: Upload sdist and wheel as artifacts +<<<<<<< before updating uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 +======= + uses: actions/upload-artifact@v7 +>>>>>>> after updating with: name: dist path: dist diff --git a/.github/workflows/_docs.yml b/.github/workflows/_docs.yml index b912fb75f6..84946a0793 100644 --- a/.github/workflows/_docs.yml +++ b/.github/workflows/_docs.yml @@ -11,7 +11,7 @@ jobs: run: sleep 60 - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v7 with: # Need this to get version number from last tag fetch-depth: 0 @@ -20,7 +20,7 @@ jobs: run: sudo apt-get install graphviz - name: Install uv - uses: astral-sh/setup-uv@v7 + uses: astral-sh/setup-uv@v8.3.2 - name: Build docs run: uv run --locked tox -e docs @@ -29,7 +29,11 @@ jobs: run: rm build/html/.doctrees/environment.pickle - name: Upload built docs artifact +<<<<<<< before updating uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 +======= + uses: actions/upload-artifact@v7 +>>>>>>> after updating with: name: docs path: build @@ -47,7 +51,7 @@ jobs: if: github.ref_type == 'tag' || github.ref_name == 'main' # 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: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0 + uses: peaceiris/actions-gh-pages@84c30a85c19949d7eee79c4ff27748b70285e453 # v4.1.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: .github/pages diff --git a/.github/workflows/_pypi.yml b/.github/workflows/_pypi.yml index fa78b9eae4..22b772ba12 100644 --- a/.github/workflows/_pypi.yml +++ b/.github/workflows/_pypi.yml @@ -8,7 +8,7 @@ jobs: steps: - name: Download dist artifact - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v8 with: name: dist path: dist diff --git a/.github/workflows/_release.yml b/.github/workflows/_release.yml index 15171d4479..14b4b269a6 100644 --- a/.github/workflows/_release.yml +++ b/.github/workflows/_release.yml @@ -7,7 +7,7 @@ jobs: steps: - name: Download artifacts - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v8 with: merge-multiple: true @@ -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@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1 + 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 fd6f922101..5c0ca11d46 100644 --- a/.github/workflows/_test.yml +++ b/.github/workflows/_test.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v7 with: # Need this to get version number from last tag fetch-depth: 0 @@ -32,13 +32,17 @@ jobs: run: git branch --track main origin/main - name: Install uv - uses: astral-sh/setup-uv@v7 + uses: astral-sh/setup-uv@v8.3.2 - name: Run tests run: uv run --locked tox -e tests - name: Upload coverage to Codecov +<<<<<<< before updating uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5 +======= + uses: codecov/codecov-action@v7 +>>>>>>> after updating with: name: ${{ inputs.python-version }}/${{ inputs.runs-on }} files: cov.xml diff --git a/.github/workflows/_tox.yml b/.github/workflows/_tox.yml index 7b386d72bb..356e8dd3ae 100644 --- a/.github/workflows/_tox.yml +++ b/.github/workflows/_tox.yml @@ -12,10 +12,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v7 - name: Install uv - uses: astral-sh/setup-uv@v7 + uses: astral-sh/setup-uv@v8.3.2 - name: Install helm plugins run: helm plugin install https://github.com/losisin/helm-values-schema-json.git --version 2.3.1 diff --git a/Dockerfile b/Dockerfile index 77df264989..f6b7a3fd65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,8 +31,11 @@ ENV UV_PYTHON_INSTALL_DIR=/python RUN --mount=type=cache,target=/root/.cache/uv \ uv sync --locked --no-editable --no-dev --managed-python +<<<<<<< before updating RUN uv pip install debugpy +======= +>>>>>>> after updating # The runtime stage copies the built venv into a runtime container FROM ubuntu:resolute AS runtime