From 4f373753665ee7d96499e4cc708366a80818e355 Mon Sep 17 00:00:00 2001 From: PONS Date: Fri, 11 Sep 2026 14:54:02 +0200 Subject: [PATCH 1/2] Fix new holder API, removed catalog which is the default --- examples/use_cases/01-tune_correction.ipynb | 8 ++++---- examples/use_cases/config/bessy2/bessy2.yaml | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/examples/use_cases/01-tune_correction.ipynb b/examples/use_cases/01-tune_correction.ipynb index de520fba..6ac66eaa 100644 --- a/examples/use_cases/01-tune_correction.ipynb +++ b/examples/use_cases/01-tune_correction.ipynb @@ -225,7 +225,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": null, "id": "33d2cb2c", "metadata": {}, "outputs": [ @@ -248,7 +248,7 @@ } ], "source": [ - "qcorrectors = SR.get_magnets(\"QForTune\")\n", + "qcorrectors = SR.magnets.get(\"QForTune\")\n", "first_q = qcorrectors[0]\n", "print(f\"The ring has {len(qcorrectors)} quadrupolar correctors. First: {first_q.get_name()}\")\n", "qcorrectors[0] # string representation" @@ -566,7 +566,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3 (ipykernel)", + "display_name": "jlp-py312", "language": "python", "name": "python3" }, @@ -580,7 +580,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.3" + "version": "3.12.2" } }, "nbformat": 4, diff --git a/examples/use_cases/config/bessy2/bessy2.yaml b/examples/use_cases/config/bessy2/bessy2.yaml index c04f66c8..6e36e0f3 100644 --- a/examples/use_cases/config/bessy2/bessy2.yaml +++ b/examples/use_cases/config/bessy2/bessy2.yaml @@ -9,10 +9,8 @@ simulators: controls: - class: pyaml_cs_oa.controlsystem.OphydAsyncControlSystem prefix: 'pons:' + backend: "EPICS" name: live - catalog: - class: pyaml_cs_oa.dynamic_catalog.DynamicCatalog - backend: epics data_folder: /data/store arrays: - class: pyaml.arrays.magnet.Magnet From 834fa02a58979cdcd759ff2fc7b160e930098e28 Mon Sep 17 00:00:00 2001 From: Teresia Olsson Date: Fri, 11 Sep 2026 15:39:21 +0200 Subject: [PATCH 2/2] Modified dependencies because pypi didn't accept direct dependencies. --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7f3e2f6a..2b2103ff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,8 +50,9 @@ cs-oa-tango = [ test = [ "pytest>=7.4", "pytest-cov>=3.0", - "pyaml-test-lattice @ git+https://github.com/python-accelerator-middle-layer/pyaml-test-lattice.git@main", + "pyaml-test-lattice", ] + doc = [ "sphinx ~= 8.1", "myst-parser",