Skip to content

Commit 83a1ffa

Browse files
Merge branch 'main' into fix-docstring-snakecase
2 parents 4971115 + b5bce55 commit 83a1ffa

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎.github/workflows/dt4acc-integration.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ jobs:
5959
python -m pip install --upgrade pip
6060
python -m pip install -e ".[test]"
6161
python -m pip install "ophyd-async[tango, ca, pva]"
62-
python -m pip install --no-deps \
63-
"tango-pyaml @ git+https://github.com/python-accelerator-middle-layer/tango-pyaml.git@1f010735bd675ad2f918958abd0396cb6766f14e" \
64-
"pyaml-cs-oa @ git+https://github.com/python-accelerator-middle-layer/pyaml-cs-oa.git@0.2.0"
62+
python -m pip install --no-deps tango-pyaml pyaml-cs-oa
6563
python -c "import tango; import tango.pyaml; import pyaml_cs_oa"
6664
6765
- name: Log in to GitLab registry

‎examples/use_cases/config/bessy2/bessy2.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ simulators:
99
controls:
1010
- class: pyaml_cs_oa.controlsystem.OphydAsyncControlSystem
1111
prefix: 'pons:'
12-
backend: "EPICS"
1312
name: live
13+
catalog:
14+
class: pyaml_cs_oa.dynamic_catalog.DynamicCatalog
15+
backend: "EPICS"
1416
data_folder: /data/store
1517
arrays:
1618
- class: pyaml.arrays.magnet.Magnet

0 commit comments

Comments
 (0)