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.6.0
_src_path: https://github.com/DiamondLightSource/python-copier-template
author_email: giles.knap@diamond.ac.uk
author_name: Giles Knap
Expand Down
6 changes: 6 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@
],
// Mount the parent as /workspaces so we can pip install peers as editable
"workspaceMount": "source=${localWorkspaceFolder}/..,target=/workspaces,type=bind",
<<<<<<< before updating
// After the container is created, install the python project in editable form
"postCreateCommand": "uv sync && uv run pre-commit install --install-hooks"
=======
// After the container is created, recreate the venv then make pre-commit first run faster
// Ensure we use system uv, as there might be a different (old) version of uv in the venv
"postCreateCommand": "/usr/bin/uv venv --clear && /usr/bin/uv sync && pre-commit install --install-hooks"
>>>>>>> after updating
}
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.6.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.3.2

- name: Build sdist and wheel
run: >
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
run: sudo apt-get install graphviz

- name: Install uv
uses: astral-sh/setup-uv@v8.3.2
uses: astral-sh/setup-uv@v10.3.2

- name: Build docs
run: uv run --locked tox -e docs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
uses: softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v3.0.3
with:
prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }}
files: "*"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fetch-depth: 0

- name: Install uv
uses: astral-sh/setup-uv@v8.3.2
uses: astral-sh/setup-uv@v10.3.2

- 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 @@ -16,7 +16,7 @@ jobs:
uses: actions/checkout@v7

- name: Install uv
uses: astral-sh/setup-uv@v8.3.2
uses: astral-sh/setup-uv@v10.3.2

- name: Run tox
run: uv run --locked tox -e ${{ inputs.tox }}
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
tags:
- "*"
pull_request:
merge_group:

jobs:
lint:
Expand Down
8 changes: 4 additions & 4 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Documentation is split into [four categories](https://diataxis.fr), also accessi
:maxdepth: 2
tutorials
```
+++
:::{card-footer}
Tutorials for installation and typical usage. New users start here.
:::

Expand All @@ -41,7 +41,7 @@ Tutorials for installation and typical usage. New users start here.
:maxdepth: 2
how-to
```
+++
:::{card-footer}
Practical step-by-step guides for the more experienced user.
:::

Expand All @@ -50,7 +50,7 @@ Practical step-by-step guides for the more experienced user.
:maxdepth: 2
explanations
```
+++
:::{card-footer}
Explanations of how it works and why it works that way.
:::

Expand All @@ -59,7 +59,7 @@ Explanations of how it works and why it works that way.
:maxdepth: 2
reference
```
+++
:::{card-footer}
Technical reference material including APIs and release notes.
:::

Expand Down
24 changes: 20 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
[build-system]
requires = ["setuptools>=64", "setuptools_scm[toml]>=8"]
requires = ["setuptools>=77.0.3", "setuptools_scm[toml]>=8"]
build-backend = "setuptools.build_meta"

[project]
name = "rtems-proxy"
classifiers = [
"Development Status :: 3 - Alpha",
<<<<<<< before updating
"License :: OSI Approved :: Apache Software License",
=======
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
>>>>>>> after updating
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
]
Expand All @@ -21,13 +26,13 @@ dependencies = [
"typer",
]
dynamic = ["version"]
license.file = "LICENSE"
license = "Apache-2.0"
license-files = ["LICENSE"]
readme = "README.md"
requires-python = ">=3.13"

[dependency-groups]
dev = [
"copier",
"myst-parser",
"pre-commit",
"pydata-sphinx-theme>=0.12",
Expand All @@ -38,7 +43,7 @@ dev = [
"sphinx-autobuild",
"sphinx-copybutton",
"sphinx-design",
"tox-uv",
"tox-uv-bare",
"types-mock",
]
# builder2ibek converts the sample builder XML to ioc.yaml in the hybrid e2e
Expand All @@ -62,6 +67,10 @@ GitHub = "https://github.com/epics-containers/rtems-proxy"
email = "giles.knap@diamond.ac.uk"
name = "Giles Knap"

[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/rtems_proxy/_version.py"

Expand Down Expand Up @@ -95,6 +104,13 @@ env_list = ["pre-commit", "type-checking", "tests", "docs"]
[tool.tox.env_run_base]
# Pass all environment variables to the test environments
passenv = ["*"]
allowlist_externals = [
"pyright",
"pytest",
"pre-commit",
"sphinx-build",
"sphinx-autobuild",
]

[tool.tox.env.pre-commit]
description = "Run pre-commit on all files"
Expand Down
11 changes: 11 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,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