In my values.yaml I have the following:
scratch:
repositories:
- name: dodal
remote_url: https://github.com/DiamondLightSource/dodal.git
- name: crystallography-bluesky
remote_url: https://github.com/DiamondLightSource/crystallography-bluesky.git
- name: daq-config-server
remote_url: https://github.com/diamondLightSource/daq-config-server.git
- name: ophyd-async
remote_url: https://github.com/bluesky/ophyd-async.git
- name: heliotrapi
remote_url: https://github.com/diamondlightsource/heliotrapi.git
where crystallography-bluesky has a dependency on dodal like:
dependencies = [
"ispyb",
...
"dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@main",
]
When trying to install this I get an error of:
INFO blueapi.cli.scratch Installing packages
Using Python 3.11.15 environment at: /app/.venv
Updating https://github.com/DiamondLightSource/dodal.git (main)
Updated https://github.com/DiamondLightSource/dodal.git (e9a073c8a2344071ab5482283134a9461f79d5c3)
× Failed to resolve dependencies for `crystallography-bluesky`
│ (v0.1.dev160+g5f0e93a59)
╰─▶ Requirements contain conflicting URLs for package `dls-dodal`:
- file:///workspace/dodal (editable)
- git+https://github.com/DiamondLightSource/dodal.git@main
I would expect the editable version to override the one specified in the pyproject.toml. I can get round this by not specifying a specific version in the pyproject.toml, which I should arguably be doing anyway as I should be making it a proper release but this is annoying.
Acceptance Criteria
- Specified scratch repos will install over ones in the dependency tree
In my values.yaml I have the following:
where
crystallography-blueskyhas a dependency ondodallike:When trying to install this I get an error of:
I would expect the editable version to override the one specified in the
pyproject.toml. I can get round this by not specifying a specific version in thepyproject.toml, which I should arguably be doing anyway as I should be making it a proper release but this is annoying.Acceptance Criteria