Skip to content

Commit 6073361

Browse files
committed
Fix dls_dev_env script for uv
1 parent a788449 commit 6073361

File tree

3 files changed

+68
-6
lines changed

3 files changed

+68
-6
lines changed

pyproject.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ dev = [
8989
"types-mock",
9090
"types-requests",
9191
]
92+
local-dodal = [
93+
"dls-dodal",
94+
]
9295

9396
[project.scripts]
9497
mx-bluesky = "mx_bluesky.__main__:main"
@@ -340,3 +343,6 @@ name = "Beamlines do not import from hyperion"
340343
type = "forbidden"
341344
source_modules = "mx_bluesky.beamlines.**"
342345
forbidden_modules = "mx_bluesky.hyperion.**"
346+
347+
[tool.uv.sources]
348+
dls-dodal = { path = "../dodal", editable = true }

utility_scripts/dls_dev_env.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ mkdir .venv
2929

3030
python -m venv .venv
3131
source .venv/bin/activate
32+
pip install uv
3233

33-
pip install --upgrade pip
34-
pip install -e .[dev]
34+
uv add --editable .[dev]
3535

3636
pre-commit install
3737

@@ -40,7 +40,7 @@ if [ ! -d "../dodal" ]; then
4040
git clone [email protected]:DiamondLightSource/dodal.git ../dodal
4141
fi
4242

43-
pip install -e ../dodal[dev]
43+
uv add --editable --group local-dodal ../dodal/
4444

4545
# get dlstbx into our env
4646
ln -s /dls_sw/apps/dials/latest/latest/modules/dlstbx/src/dlstbx/ .venv/lib/python3.11/site-packages/dlstbx

uv.lock

Lines changed: 59 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)