Update copier template #1536

jacob720 · 2026-01-08T14:15:38Z

Instructions to reviewer on how to test:

Check tests pass
Check tox tools still work
Check uv works as intended

Checks for reviewer

Would the PR title make sense to a user on a set of release notes

codecov · 2026-01-08T14:18:52Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 92.65%. Comparing base (75ea250) to head (1b21512).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1536      +/-   ##
==========================================
- Coverage   92.67%   92.65%   -0.02%     
==========================================
  Files         152      151       -1     
  Lines        8464     8433      -31     
==========================================
- Hits         7844     7814      -30     
+ Misses        620      619       -1

Components	Coverage Δ
i24 SSX	`78.56% <ø> (ø)`
hyperion	`98.11% <ø> (ø)`
other	`98.27% <ø> (+0.01%)`	⬆️

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

rtuck99 · 2026-01-09T15:23:00Z

pyproject.toml

+    [
+        "pyright",
+        "--pythonpath",
+        ".venv/bin/python",


see dodal PR comment re venv location

Done the same thing you did on Dodal

rtuck99 · 2026-01-09T16:11:12Z

docs/developer/general/tutorials/profile-tests.rst

 .. code-block:: bash

-    pip install pytest-profiling
+    uv add pytest-profiling


We don't want to uv add this, probably just uv pip install

rtuck99 · 2026-01-09T16:11:30Z

docs/developer/general/tutorials/profile-tests.rst


    cd prof
-    pip install snakeviz
+    uv add --frozen snakeviz


utility_scripts/dls_dev_env.sh

rtuck99 · 2026-01-09T16:34:00Z

utility_scripts/dls_dev_env.sh

@@ -16,33 +16,37 @@ if [ "$current_dir" != "$two_levels_up" ]; then
  exit 1


I think there are also some changes needed in deploy_mx_bluesky_app_to_k8s.sh

rtuck99 · 2026-01-09T16:42:17Z

Dockerfile

@@ -1,26 +1,34 @@
 # The devcontainer should use the developer target and run as root with podman


I think, now that blueapi is now on uv, that Dockerfile.blueapi might need to be updated.

Ditto Dockerfile.hyperion

The containers seem to build fine, I think when we update which blueapi image we pull we'll have to change the Dockerfile but might be worth doing this in a separate PR?

I tried to update Dockerfile.hyperion to use uv but kept getting errors about device space when building locally, I think this may be because uv caches more than pip?
I think we should do Dockerfile.blueapi seperately as pulling the new blueapi image will break stuff #1516

rtuck99

Approved, need to update to get tests to pass against latest dodal,

DominicOram · 2026-01-19T12:25:59Z

Some thoughts as discussed:

The CI is failing because we haven't run uv sync after DiamondLightSource/dodal@905cd1f was merged into main. Once this is merged uv sync will be in the pre-commit hook so won't be an issue. We can fix this manually on here and see how it goes. We may want to get a uv sync in the CI at some point in the future though
It would be good for the CI to print the versions of things that we're running in the CI as it used to do this.
@jacob720 and I had some discussion about the value of having the lock file in git, I think we may want to remove it at some point but we can just run with it and see

This reverts commit 039028b.

Update copier template

911c2e3

jacob720 requested a review from a team as a code owner January 8, 2026 14:15

jacob720 added the dev experience Changes relating to developer experience label Jan 8, 2026

Merge branch 'main' into 1474_update_copier_template

a788449

jacob720 marked this pull request as draft January 8, 2026 15:42

jacob720 force-pushed the 1474_update_copier_template branch from 6073361 to e8840db Compare January 8, 2026 16:07

Fix dls_dev_env script for uv

cfe3772

jacob720 force-pushed the 1474_update_copier_template branch from e8840db to cfe3772 Compare January 8, 2026 16:23

jacob720 marked this pull request as ready for review January 9, 2026 14:37

rtuck99 self-assigned this Jan 9, 2026

Change some pip installs to uv

bfcd46c

rtuck99 reviewed Jan 9, 2026

View reviewed changes

utility_scripts/dls_dev_env.sh Outdated Show resolved Hide resolved

rtuck99 reviewed Jan 9, 2026

View reviewed changes

PR comments

a9f9abc

jacob720 requested a review from rtuck99 January 16, 2026 14:42

rtuck99 approved these changes Jan 19, 2026

View reviewed changes

Merge branch 'main' into 1474_update_copier_template

e994bc1

jacob720 enabled auto-merge (squash) January 19, 2026 11:55

Fix virtualenv resolution for pyright

c1114a5

jacob720 added 2 commits January 19, 2026 13:14

Merge branch 'main' into 1474_update_copier_template

6f781e1

Update lockfile

1b21512

jacob720 merged commit 039028b into main Jan 19, 2026
9 of 10 checks passed

jacob720 deleted the 1474_update_copier_template branch January 19, 2026 14:00

jacob720 added a commit that referenced this pull request Jan 19, 2026

Revert "Update copier template (#1536)"

98a42e6

This reverts commit 039028b.

jacob720 mentioned this pull request Jan 19, 2026

Print dependency tree in CI tests action #1554

Merged

1 task

		@@ -16,33 +16,37 @@ if [ "$current_dir" != "$two_levels_up" ]; then
		exit 1

		@@ -1,26 +1,34 @@
		# The devcontainer should use the developer target and run as root with podman

Update copier template #1536

Update copier template #1536

Uh oh!

Conversation

jacob720 commented Jan 8, 2026

Instructions to reviewer on how to test:

Checks for reviewer

Uh oh!

codecov bot commented Jan 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jacob720 Jan 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rtuck99 left a comment

Choose a reason for hiding this comment

Uh oh!

DominicOram commented Jan 19, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov bot commented Jan 8, 2026 •

edited

Loading

jacob720 Jan 16, 2026 •

edited

Loading