Enh/hkl

pixi.toml

@@ -3,8 +3,12 @@ channels = ["conda-forge"]
 name = "cdi-profile-collection"
 platforms = [{ platform = "linux-64", glibc = "2.17" }, "osx-64", "osx-arm64"]
 version = "2026.2.0"
+<<<<<<< HEAD
 requires-pixi = ">=0.82.1"
 
+=======
+preview = ["pixi-build"]
+>>>>>>> 46d7c4d (ENH: use pixi-build to get cditools)
 
 [activation.env]
 OPHYD_ASYNC_PRESERVE_DETECTOR_STATE = "YES"
@@ -14,20 +18,20 @@ bluesky-base = ">=1.15.1,<2"
 bluesky-queueserver = ">=0.0.25,<0.0.26"
 ca-certificates = ">=2026.10.19"
 certifi = ">=2026.10.19"
-matplotlib-base = ">=3.10"
-networkx = ">=3.4.2,<4"
+matplotlib-base= ">=3.10.9,<4"
+networkx = ">=3.6.1,<4"
 nslsii = ">=0.11.9,<0.12"
-numpy = "*"
+numpy = ">=2.4.6,<3"
 ophyd = ">=1.11.2,<2"
-pyepics = "*"
-python = ">=3.12,<3.13"
+pyepics = ">=3.5.10,<4"
+python = ">=3.13.14,<3.14"
 semver = ">=3.0.4,<4"
 tiled-client = ">=0.2.17,<0.3"
 # needed until we get ophyd-async packaged
-colorlog = ">=6.9.0,<7"
-pydantic-numpy = "*"
+colorlog = ">=6.11.0,<7"
+pydantic-numpy = ">=8.0.0,<9"
 hdf5-external-filter-plugins = ">=0.1.0,<0.2"
-databroker = "==2.0.0b68"
+databroker = ">=2.0.1,<3"
 p4p = ">=4.2.0,<5"
 pip = ">=26.2.2"
 bluesky-tiled-plugins = ">=2.0.9,<3"
@@ -37,12 +41,12 @@ xrayutilities = ">=1.7.12,<2"
 [feature.profile.target.linux-64.dependencies]
 blosc-hdf5-plugin = ">=1.0.1,<2"
 epicscorelibs = ">=7.0.7.99.1.1,<8"
-ophyd-async = ">=0.19.4"
+ophyd-async = ">=0.20.1,<0.21"
 
 [feature.profile.pypi-dependencies]
 # TODO get this onto conda-forge
 # cditools = { git = "https://github.com/nsls2/cditools", rev="main" }
-cditools = { git = "https://github.com/nsls2/cditools", rev = "debug-eiger-acquire" }
+cditools = { git = "https://github.com/nsls2/cditools", rev="enh/hkl" }
 # cditools = { path = "../../source/nsls2/cditools", editable = true }
 pvxslibs = ">=1.3.2, <2"
 
@@ -61,9 +65,9 @@ qs-server = "uvicorn --host localhost --port 60610 bluesky_httpserver.server:app
 
 
 [feature.terminal.dependencies]
-ipython = ">=9.5.0"
-pyside6 = "*"
-numpy = ">2"
+ipython = ">=9.15.0,<10"
+pyside6 = ">=6.11.1,<7"
+numpy = ">=2.4.6,<3"
 
 
 [feature.terminal.tasks]
@@ -79,7 +83,7 @@ black = "*"
 isort = "*"
 prettier = "*"
 nbstripout = "*"
-prek = ">=0.3.8,<0.4"
+prek = ">=0.4.11,<0.5"
 virtualenv = ">=21.14.12"
 
 [feature.dev.tasks]

startup/30-area-detectors.py

@@ -1,5 +1,5 @@
+from collections.abc import Sequence
 from typing import Annotated as A
-from typing import Sequence
 
 from cditools.eiger_async import EigerDetector
 from cditools.merlin_async import MerlinDetector