Skip to content

fix: Migrate to tox-uv-bare - #403

Open
AlexanderWells-diamond wants to merge 4 commits into
mainfrom
migrate_to_tox_uv_bare
Open

AlexanderWells-diamond wants to merge 4 commits into
mainfrom
migrate_to_tox_uv_bare

Conversation

@AlexanderWells-diamond

Copy link
Copy Markdown
Contributor

This removes the need to have uv itself packaged into the venv. We now use the devcontainer's default uv version.

The devcontainer.json changes are to deal with a migration issue that can occur due to older uv versions being in the venv - if that old version no longer meets the required version in pyproject.toml -> tool.uv -> required-version it means you end up with a venv that cannot run any uv commands as it is below the minimum version.

@AlexanderWells-diamond AlexanderWells-diamond changed the title Migrate to tox-uv-bare fix: Migrate to tox-uv-bare Nov 11, 2026
@AlexanderWells-diamond

AlexanderWells-diamond commented Nov 11, 2026 •

Copy link
Copy Markdown
Contributor Author

I'm having difficulties disentangling test failures that appear to be present on main from changes made on this branch. I'll spend some more time investigating.

@AlexanderWells-diamond

Copy link
Copy Markdown
Contributor Author

@coretl I found my issue, raised #404 to cover it

@coretl

coretl commented Nov 12, 2026

Copy link
Copy Markdown
Contributor

@AlexanderWells-diamond the error

  +<<<<<<< before updating
  +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).
  +=======
   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/pages/how-to.html).

Is because of the release migration we're doing in #373

I'll move the tag to a branch which should fix it...

@shree-iyengar-dls FYI

@coretl

coretl commented Nov 12, 2026

Copy link
Copy Markdown
Contributor

I'll move the tag to a branch which should fix it...

Done. Now it's just the error from #404

@AlexanderWells-diamond
AlexanderWells-diamond force-pushed the migrate_to_tox_uv_bare branch 3 times, most recently from 63ac0b9 to e5e4a0a Compare November 13, 2026 12:22
This removes the need to have `uv` itself packaged into the venv.
We now use the devcontainer's default uv version.

The devcontainer.json changes are to deal with a migration issue that
can occur due to older uv versions being in the venv - if that old
version no longer meets the required version in `pyproject.toml` ->
 `tool.uv` -> `required-version` it means you end up with a venv that
cannot run any uv commands as it is below the minimum version.
gilesknap and others added 3 commits November 13, 2026 15:20
tox-uv-bare no longer prepends the directory of the uv binary to PATH,
which used to be <project>/.venv/bin when uv was installed as a package.
The nested tox runs therefore picked up pytest, pyright and sphinx-build
from the outer venv (or not at all). Activate the venv explicitly.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Uybqz7UjVJfezyDTBqiHGM
@AlexanderWells-diamond

Copy link
Copy Markdown
Contributor Author

I think this is now ready to review

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants