Skip to content

Commit 381496c

Browse files
authored
Update copier template to 5.2.0 (#247)
* Update copier template to 5.2.0 * Remove lazygit install script Copier template 5.2.0 uses an ubuntu-devcontainer with lazygit pre-installed
1 parent 4b6c1dc commit 381496c

11 files changed

Lines changed: 45 additions & 50 deletions

File tree

.copier-answers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier
2-
_commit: 5.0.0a4
2+
_commit: 5.2.0
33
_src_path: gh:DiamondLightSource/python-copier-template
44
author_email: oliver.copping@diamond.ac.uk
55
author_name: Oliver Copping

.devcontainer/install_lazygit.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ It is recommended that developers use a [vscode devcontainer](https://code.visua
2424

2525
This project was created using the [Diamond Light Source Copier Template](https://github.com/DiamondLightSource/python-copier-template) for Python projects.
2626

27-
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.0.0a4/how-to.html).
27+
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).

.github/dependabot.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

.github/workflows/_test.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ on:
99
type: string
1010
description: The runner to run this job on
1111
required: true
12-
secrets:
13-
CODECOV_TOKEN:
14-
required: true
1512

1613
env:
1714
# https://github.com/pytest-dev/pytest/issues/2042
@@ -41,5 +38,3 @@ jobs:
4138
with:
4239
name: ${{ inputs.python-version }}/${{ inputs.runs-on }}
4340
files: cov.xml
44-
env:
45-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ jobs:
1818
strategy:
1919
matrix:
2020
runs-on: ["ubuntu-latest"] # can add windows-latest, macos-latest
21-
python-version: ["3.12", "3.13"]
21+
python-version: ["3.12", "3.13", "3.14"]
2222
fail-fast: false
2323
uses: ./.github/workflows/_test.yml
2424
with:
2525
runs-on: ${{ matrix.runs-on }}
2626
python-version: ${{ matrix.python-version }}
27-
secrets:
28-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
2927

3028
dist:
3129
uses: ./.github/workflows/_dist.yml

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ repos:
33
rev: v6.0.0
44
hooks:
55
- id: check-added-large-files
6-
args: ["--maxkb=1000"] # uv.lock is more than 500kB
6+
exclude: ^uv.lock
77
- id: check-yaml
88
- id: check-merge-conflict
99
- id: end-of-file-fixer

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# The devcontainer should use the developer target and run as root with podman
22
# or docker with user namespaces.
3-
FROM ghcr.io/diamondlightsource/ubuntu-devcontainer:noble AS developer
3+
FROM ghcr.io/diamondlightsource/ubuntu-devcontainer:resolute AS developer
44

55
# Add any system dependencies for the developer/build environment here
66
RUN apt-get update -y && apt-get install -y --no-install-recommends \

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ A package for building Phoebus GUIs
99

1010
Techui-builder is a module for building and organising phoebus gui screens using a builder-ibek yaml description of an IOC, with a user created techui.yaml file containing a description of the screens the user wants to create.
1111

12-
Source | <https://github.com/DiamondLightSource/techui-builder>
12+
What | Where
1313
:---: | :---:
14+
Source | <https://github.com/DiamondLightSource/techui-builder>
1415
PyPI | `pip install techui-builder`
1516
Releases | <https://github.com/DiamondLightSource/techui-builder/releases>
1617

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ description = "A package for building Phoebus GUIs"
99
classifiers = [
1010
"Programming Language :: Python :: 3.12",
1111
"Programming Language :: Python :: 3.13",
12+
"Programming Language :: Python :: 3.14",
1213
]
1314
urls = { GitHub = "https://github.com/DiamondLightSource/techui-builder" }
1415
authors = [
@@ -124,7 +125,7 @@ commands = [
124125
[
125126
"basedpyright",
126127
"--pythonpath",
127-
".venv/bin/python",
128+
"{env:VIRTUAL_ENV}/bin/python",
128129
"src",
129130
"tests",
130131
{ replace = "posargs", default = [

0 commit comments

Comments
 (0)