Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
2 changes: 1 addition & 1 deletion .github/workflows/_dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
11 changes: 11 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
]
}
Loading