refactor: Convert to use `uv` #248

OCopping · 2025-04-04T14:15:28Z

This PR aims to move away from using the venv/tox setup for a more modern uv (and tox-uv until uv adds it's own form of runners) approach.

GDYendell · 2025-04-07T09:26:41Z

If hatch will only be temporary would it be better to stick with tox for now using tox-uv?

callumforrester · 2025-04-07T11:36:50Z

Relates to #246, just to link issues

.pre-commit-config.yaml

Dockerfile

.devcontainer/devcontainer.json

.github/workflows/ci.yml

callumforrester · 2025-04-24T07:49:28Z

@OCopping Should probably also update the tests to use uv pip now too: https://github.com/DiamondLightSource/python-copier-template/blob/002a1c5cccd235b4898c02b74cec63f6265d7adc/tests/test_example.py

OCopping · 2025-04-24T07:52:21Z

@OCopping Should probably also update the tests to use uv pip now too: https://github.com/DiamondLightSource/python-copier-template/blob/002a1c5cccd235b4898c02b74cec63f6265d7adc/tests/test_example.py

I have some of those changes uncommited locally; was trying to fix the CI first

coretl

I got half way through a review a while back, not sure if these are still relevant, but I'll submit them now anyway. I'll try and find time to do a proper review next week

.github/actions/install_requirements/action.yml

.github/workflows/ci.yml

.pre-commit-config.yaml

Dockerfile

…ing test_template_mypy

Otherwise ruff complains, the template tests catch this anyway

coretl · 2025-09-22T15:00:51Z

Still need to update the docs

pyproject.toml

AlexanderWells-diamond

Overall this looks fine to me; most of my comments are just minor questions/clarifications.
I tried coverting aioca to use this version of the template and it appears to have run as expected, with failures explainable as issues with that project, not the template itself: DiamondLightSource/aioca#74

Dockerfile

template/Dockerfile.jinja

template/pyproject.toml.jinja

tests/test_example.py

template/{% if git_platform=="github.com" %}.github{% endif %}/workflows/ci.yml.jinja

.github/workflows/_tox.yml

Co-authored-by: Alexander Wells <79699091+AlexanderWells-diamond@users.noreply.github.com>

But add extra docs-autobuild target

Otherwise docs autobuild doesn't work as the forward kicks in before sphinx can start the server

Stale

AlexanderWells-diamond

Looks good to me

OCopping force-pushed the move-to-uv branch from b053b4d to 014270f Compare April 4, 2025 14:18

OCopping force-pushed the move-to-uv branch 3 times, most recently from 286c223 to 455efa5 Compare April 10, 2025 08:17

GDYendell reviewed Apr 10, 2025

View reviewed changes

.pre-commit-config.yaml Outdated Show resolved Hide resolved

callumforrester previously requested changes Apr 10, 2025

View reviewed changes

Dockerfile Outdated Show resolved Hide resolved

.devcontainer/devcontainer.json Outdated Show resolved Hide resolved

.github/workflows/ci.yml Show resolved Hide resolved

OCopping mentioned this pull request Apr 22, 2025

Move in updates from copier template PR DiamondLightSource/techui-builder#30

Merged

OCopping force-pushed the move-to-uv branch from 6c79a59 to ab7094b Compare April 23, 2025 14:52

coretl reviewed May 1, 2025

View reviewed changes

callumforrester mentioned this pull request May 6, 2025

Move to uv fix #259

Closed

OCopping force-pushed the move-to-uv branch from e3ce077 to 30c743a Compare May 9, 2025 15:01

OCopping added 13 commits May 13, 2025 08:53

Converted to use uv and hatch over venv and tox

1faa36d

Replace tox with tox-uv; Remove hatch.yml

4f3290c

Fix CI when building env

e67dd5a

Remove hatch run from _test.yml; Bump pre-commit hook versions

738f4fb

Fix pytest runner

4aecf11

Update template files for uv

5403646

Tidy pyproject.toml

be8066a

Revert unintended ci.yml changes

70015df

Fix actions build, and updates to pyproject.toml

7ff792c

Improvements to template pyproject.toml

5ce9caf

Fixes to dev container and tests (but some test cases fail, e.g. runn…

c71bdfb

…ing test_template_mypy

Revert changes to ci.yml

50defbc

Update pre-commit-config

45c895a

callumforrester force-pushed the move-to-uv branch from 30c743a to 45c895a Compare May 13, 2025 07:54

Revert discussed changes and remove commented out parts

5bbb867

MJGaughran mentioned this pull request Sep 17, 2025

Put together repository template python-accelerator-middle-layer/governance#19

Open

coretl added 5 commits September 18, 2025 13:19

Merge remote-tracking branch 'origin/main' into move-to-uv

d55fd3b

Add in changes from ophyd-async

cf3f4be

Merge remote-tracking branch 'origin/move-to-uv' into move-to-uv

3d617c6

tox-uv tweaks

87224d4

Disable pep8-naming for the top level

328d50a

Otherwise ruff complains, the template tests catch this anyway

coretl marked this pull request as ready for review September 22, 2025 14:56

coretl requested a review from AlexanderWells-diamond September 22, 2025 14:57

coretl marked this pull request as draft September 22, 2025 15:00

coretl requested a review from callumforrester September 22, 2025 15:01

coretl reviewed Sep 22, 2025

View reviewed changes

pyproject.toml Outdated Show resolved Hide resolved

Add docs

7073cba

coretl marked this pull request as ready for review September 22, 2025 16:27

AlexanderWells-diamond previously approved these changes Sep 23, 2025

View reviewed changes

Update .github/workflows/_tox.yml

650f006

Co-authored-by: Alexander Wells <79699091+AlexanderWells-diamond@users.noreply.github.com>

coretl dismissed AlexanderWells-diamond’s stale review via 650f006 September 23, 2025 15:55

coretl and others added 5 commits September 24, 2025 09:25

Address review comments

2555a8a

Move back to tox TOML format

64dcd6b

But add extra docs-autobuild target

Don't autoforward ports in devcontainer

f69d899

Otherwise docs autobuild doesn't work as the forward kicks in before sphinx can start the server

Tidy diff

5a6a047

Remove pytest version pinning from template pyproject.toml

07a92bd

OCopping requested review from AlexanderWells-diamond, callumforrester and coretl and removed request for callumforrester September 25, 2025 08:14

AlexanderWells-diamond approved these changes Sep 25, 2025

View reviewed changes

coretl approved these changes Sep 25, 2025

View reviewed changes

coretl merged commit ed290c8 into main Sep 25, 2025
6 checks passed

refactor: Convert to use uv #248

refactor: Convert to use uv #248

Uh oh!

Conversation

OCopping commented Apr 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GDYendell commented Apr 7, 2025

Uh oh!

callumforrester commented Apr 7, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

callumforrester commented Apr 24, 2025

Uh oh!

OCopping commented Apr 24, 2025

Uh oh!

coretl left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

coretl commented Sep 22, 2025

Uh oh!

Uh oh!

AlexanderWells-diamond left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AlexanderWells-diamond left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

refactor: Convert to use `uv` #248

refactor: Convert to use `uv` #248

OCopping commented Apr 4, 2025 •

edited

Loading