builder2ibek 2.3.0__tar.gz → 2.4.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/commands/beamline-reconvert.md +2 -1
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/commands/ioc-convert.md +5 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/shared/module-special-cases.md +8 -1
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/shared/verify-against-builder.md +9 -3
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.devcontainer/claude-sandbox.conf +4 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.devcontainer/initializeCommand.sh +5 -1
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.github/workflows/_dist.yml +8 -2
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.gitignore +3 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/CLAUDE.md +6 -0
- builder2ibek-2.4.0/Dockerfile +75 -0
- builder2ibek-2.4.0/MANIFEST.in +2 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/PKG-INFO +27 -2
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/README.md +25 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/how-to/convert-ioc-instance.md +9 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/reference/dlsplc-migration.md +13 -7
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/tutorials/installation.md +1 -1
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/pyproject.toml +2 -1
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/__main__.py +11 -2
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/_version.py +3 -3
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/convert.py +33 -7
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/ADAndor.py +1 -0
- builder2ibek-2.4.0/src/builder2ibek/converters/BLGui.py +62 -0
- builder2ibek-2.4.0/src/builder2ibek/converters/interlock.py +112 -0
- builder2ibek-2.4.0/src/builder2ibek/converters/motorPLC.py +111 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/pmac.py +69 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/pvlogging.py +14 -6
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/slsDetector.py +1 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/vacuumSpace.py +91 -15
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/moduleinfos.py +3 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/reconvert.py +25 -1
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/types.py +6 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/utils.py +28 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek.egg-info/PKG-INFO +27 -2
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek.egg-info/SOURCES.txt +6 -2
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek.egg-info/scm_file_list.json +28 -2
- builder2ibek-2.4.0/src/builder2ibek.egg-info/scm_version.json +8 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/BL99P-EA-IOC-05.yaml +1 -1
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl04i-va-ioc-01.ioc.subst +4 -3
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl04i-va-ioc-01.st.cmd +2 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl04i-va-ioc-01.yaml +8 -3
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl11i-va-ioc-01.ioc.subst +7 -5
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl11i-va-ioc-01.st.cmd +2 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl11i-va-ioc-01.yaml +15 -5
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl15i-va-ioc-01.st.cmd +4 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl16i-va-ioc-01.ioc.subst +38 -27
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl16i-va-ioc-01.st.cmd +2 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl16i-va-ioc-01.yaml +64 -6
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl19i-va-ioc-01.ioc.subst +54 -46
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl19i-va-ioc-01.st.cmd +16 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl19i-va-ioc-01.yaml +78 -11
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl45p-mo-ioc-01.ioc.subst +2 -2
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl45p-mo-ioc-01.yaml +1 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl99p-ea-ioc-05.ioc.subst +2 -2
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl99p-ea-ioc-05.yaml +1 -1
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/sr03c-va-ioc-01.ioc.subst +2 -2
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/sr03c-va-ioc-01.st.cmd +2 -0
- builder2ibek-2.4.0/tests/test_interlock_blgui.py +292 -0
- builder2ibek-2.4.0/tests/test_pmac_cs_groups.py +93 -0
- builder2ibek-2.4.0/tests/test_pvlogging.py +57 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/test_reconvert_cli.py +13 -0
- builder2ibek-2.3.0/tests/vendored-support-dls/adandor/adandor.ibek.support.yaml → builder2ibek-2.4.0/tests/vendored-support-dls/ADAndor_dls/ADAndor_dls.ibek.support.yaml +1 -1
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/DLS8515/DLS8515.ibek.support.yaml +2 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/IOCInfo/IOCInfo.ibek.support.yaml +6 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/TimingTemplates/TimingTemplates.ibek.support.yaml +6 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/VENDORED_FROM +2 -2
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/cmsIon/cmsIon.ibek.support.yaml +12 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/digitelSpc/digitelSpc.ibek.support.yaml +12 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/dlsPLC/dlsPLC.ibek.support.yaml +376 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/hidenRGA/hidenRGA.ibek.support.yaml +28 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/mxEH/mxEH.ibek.support.yaml +6 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/rackFan/rackFan.ibek.support.yaml +12 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/rga/rga.ibek.support.yaml +18 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/transfocator/transfocator.ibek.support.yaml +14 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/userIO/userIO.ibek.support.yaml +62 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/vacuumSpace/vacuumSpace.ibek.support.yaml +12 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/water/water.ibek.support.yaml +35 -0
- builder2ibek-2.4.0/uv.lock +2002 -0
- builder2ibek-2.3.0/Dockerfile +0 -27
- builder2ibek-2.3.0/src/builder2ibek/converters/BLGui.py +0 -13
- builder2ibek-2.3.0/src/builder2ibek/converters/interlock.py +0 -40
- builder2ibek-2.3.0/src/builder2ibek.egg-info/scm_version.json +0 -8
- builder2ibek-2.3.0/tests/samples/bl21i-mo-ioc-01_blacklist.txt +0 -6
- builder2ibek-2.3.0/uv.lock +0 -2239
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/claude-sandbox.conf +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/commands/beamline-check.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/commands/beamline-convert.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/commands/compose2helm.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/commands/ioc-check.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/commands/ioc-convert-raw.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/commands/ioc-inspect.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/commands/memo.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/commands/support-create.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/commands/support-fix.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/commands/support-inspect.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/beamline-gui/SKILL.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/epics7-migration-debugging/SKILL.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/ibek-concepts/SKILL.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/ibek-pattern-vendoring/SKILL.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/ibek-support-ansible/SKILL.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/shared/autosave-conversion.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/shared/builder-py-analysis.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/shared/error-categorization.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/shared/find-boot-script.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/shared/find-ioc-xmls.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/shared/find-module-path.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/shared/module-rename-map.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/shared/services-repo-resolution.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/shared/support-yaml-rules.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/shared/testing-and-ci.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/shared/vxworks-to-rtems-differences.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/skills-edit/SKILL.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/streamdevice-sweep/SKILL.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/streamdevice-sweep/audit-descriptions.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/streamdevice-sweep/check-eligibility.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/streamdevice-sweep/image-modules.sh +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/streamdevice-sweep/render-report.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/streamdevice-sweep/run-sweep.sh +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/streamdevice-sweep/scan-candidates.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/streamdevice-sweep/strip-images.lua +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/streamdevice-sweep/sweep-docs.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/vdct-conversion/SKILL.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/vdct-conversion/canon-db.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/vdct-conversion/convert-module.sh +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/vdct-conversion/default-annotation-macros.sh +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/vdct-conversion/find-id-targets.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/vdct-conversion/macro-report.sh +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/vdct-conversion/make-test-ioc.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/vdct-conversion/rename-vdct-orphans.sh +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.claude/skills/vdct-conversion/validate-module.sh +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.copier-answers.yml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.devcontainer/devcontainer.json +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.devcontainer/local_build.sh +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.devcontainer/postCreate.sh +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.gitattributes +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.github/CONTRIBUTING.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.github/ISSUE_TEMPLATE/bug_report.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.github/ISSUE_TEMPLATE/issue.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.github/copilot-instructions.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.github/pages/index.html +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.github/pages/make_switcher.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.github/workflows/_docs.yml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.github/workflows/_pypi.yml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.github/workflows/_release.yml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.github/workflows/_test.yml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.github/workflows/_tox.yml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.github/workflows/ci.yml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.github/workflows/periodic.yml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.gitleaks.toml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.gitmodules +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.gitremotes +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.pre-commit-config.yaml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.python-version +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.vscode/extensions.json +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.vscode/mcp.json +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.vscode/settings.json +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/.vscode/tasks.json +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/LICENSE +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/_api.rst +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/_static/one-ioc-eight-repos.html +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/_templates/custom-module-template.rst +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/conf.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/conftest.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/explanations/decisions/0001-record-architecture-decisions.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/explanations/decisions/0002-switched-to-python-copier-template.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/explanations/decisions/0003-remove-mcp-server-for-copilot.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/explanations/decisions/COPYME +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/explanations/decisions.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/explanations/golden-file-tests.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/explanations/one-ioc-eight-repos.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/explanations.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/genindex.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/how-to/after-beamline-convert.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/how-to/autosave.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/how-to/contribute.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/how-to/create-converter.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/how-to/create-generic-ioc-repo.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/how-to/migrate-autosave.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/how-to/runtime-support.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/how-to/verify-with-devcontainer.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/how-to.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/images/dls-logo.svg +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/index.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/reference.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/tutorials/convert-ioc-xml.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/tutorials/create-support-yaml-advanced.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/tutorials/create-support-yaml.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/docs/tutorials.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/renovate.json +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/setup.cfg +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/__init__.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/builder.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/ACCELCryoIP.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/ADAravis.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/ADCore.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/ADIvium.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/ADOdin.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/ADOdinTristan.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/ADPilatus.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/ADZMQ.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/AMI186.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/BL11I.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/BL15I-BUILDER.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/BL19I.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/BL20J.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/BL21I.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/BL46P-BUILDER.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/BLfeedback.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/CrateMonitor.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/CryoCoolerXV.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/DLS8515.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/DruckDPI515.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/ETLdetector.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/FINS.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/FastVacuum.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/Hy8401ip-asyn.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/Hy8401ip.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/Hy8401ipTemplates.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/Hy8402ip.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/Hy8414.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/IOCInfo.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/OXCS700.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/OXCS700asyn.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/OXCryo.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/QPC.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/README.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/SR-VA.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/SchottLLS.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/SycosH-Hot.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/TimingTemplates.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/Xspress3.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/__init__.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/adUtil.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/agilent33220A.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/agilent53220.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/alicatGasFlow.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/asyn.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/autosave.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/bronkhorstFlowBus.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/cmsIon.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/cognexDataMan100.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/currAmp.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/deltaTauPLCStat.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/deviocstats.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/digitelMpc.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/digitelSpc.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/directoryMonitor.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/dlsPLC.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/enzLoCuM4.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/epics_base.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/ether_ip.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/ethercat.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/eurotherm2k.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/eurothermModbus.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/femto.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/ffmpegServer.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/filters.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/fogaleHLS.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/fw102.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/fzoom.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/gasInjectionRig.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/gdaPlugins.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/gdaPlugins.yaml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/globalHandler.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/harvardSyringe.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/hidenRGA.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/insertionDevice.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/ipac.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/keithley6514.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/lakeshore336.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/lakeshore340.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/laudaRE2xx.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/leybold.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/mca.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/mirror.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/mitsubishiRobot.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/mks937a.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/mks937b.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/mks9xx.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/motomanNX100.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/motor.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/motorSmarAct.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/mrfTiming.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/mrfioc2.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/mxEH.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/pgmVls.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/picotechPT104.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/pmacCoord.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/pmacUtil.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/positioner.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/procServControl.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/quadEM.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/rackFan.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/records.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/rga.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/rgamv2.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/scpi.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/smaractEcm.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/smargon.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/strainGauge.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/temperature.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/terminalserver.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/tpmac.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/transfocator.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/uniblitz.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/userIO.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/utility.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/vacuumValve.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/water.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/converters/zebra.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/db2autosave.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/dbcompare.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/migrate_autosave.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek/support_defaults.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek.egg-info/dependency_links.txt +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek.egg-info/entry_points.txt +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek.egg-info/requires.txt +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/src/builder2ibek.egg-info/top_level.txt +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/sync-support +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/__init__.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/check_pin_freshness.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/conftest.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/BL03I-MO-IOC-11.xml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/BL04I-MO-IOC-03.xml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/BL04I-VA-IOC-01.xml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/BL04I-VA-IOC-01_expanded.db +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/BL11I-CS-IOC-09.xml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/BL11I-VA-IOC-01.xml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/BL15I-VA-IOC-01.xml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/BL16I-VA-IOC-01.xml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/BL19I-VA-IOC-01.xml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/BL21I-MO-IOC-01.xml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/BL45P-MO-IOC-01.xml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/BL99P-EA-IOC-05.xml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/SR03C-VA-IOC-01.xml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/SR03C-VA-IOC-01_expanded.db +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl03i-mo-ioc-11.ioc.subst +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl03i-mo-ioc-11.st.cmd +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl03i-mo-ioc-11.yaml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl04i-mo-ioc-03.ioc.subst +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl04i-mo-ioc-03.st.cmd +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl04i-mo-ioc-03.yaml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl11i-cs-ioc-09.ioc.subst +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl11i-cs-ioc-09.st.cmd +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl11i-cs-ioc-09.yaml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl15i-va-ioc-01.ioc.subst +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl15i-va-ioc-01.yaml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl21i-mo-ioc-01.ioc.subst +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl21i-mo-ioc-01.st.cmd +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl21i-mo-ioc-01.yaml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0/tests/samples}/bl21i-mo-ioc-01_blacklist.txt +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl45p-mo-ioc-01.st.cmd +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/bl99p-ea-ioc-05.st.cmd +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/compare.diff +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/cross_ref_test.ioc.subst +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/cross_ref_test.st.cmd +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/cross_ref_test.xml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/cross_ref_test.yaml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/make_samples.sh +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/motor.template +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/motorpositioner.ioc.subst +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/motorpositioner.st.cmd +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/motorpositioner.xml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/motorpositioner.yaml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/sr03c-va-ioc-01.db +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/samples/sr03c-va-ioc-01.yaml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/test_autosave.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/test_cli.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/test_compare.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/test_file_conversion.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/test_migrate_autosave.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/test_submodule_pins.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/test_vendored_support.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendor_support_dls.py +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/BL04I/BL04I.ibek.support.yaml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/Hy8401ip/Hy8401ip.ibek.support.yaml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/Hy8402ip/Hy8402ip.ibek.support.yaml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/README.md +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/SR-VA/SR-VA.ibek.support.yaml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/ipac/ipac.ibek.support.yaml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/mirror/mirror.ibek.support.yaml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/mrfTiming/mrfTiming.ibek.support.yaml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/tests/vendored-support-dls/vacuumValve/vacuumValve.ibek.support.yaml +0 -0
- {builder2ibek-2.3.0 → builder2ibek-2.4.0}/update-schema +0 -0
|
@@ -35,7 +35,8 @@ uv run builder2ibek reconvert $1 --services-repo <services-repo> --json
|
|
|
35
35
|
Discovers BUILDER XMLs (work area first, prod fallback), matches lowercased
|
|
36
36
|
XML stems to `<services-repo>/services/<ioc-name>/config/ioc.yaml`,
|
|
37
37
|
re-runs `xml2yaml` for each match (preserving the existing `description`
|
|
38
|
-
field
|
|
38
|
+
field, and `--blgui` when the existing ioc.yaml has `BLGui.*` entities),
|
|
39
|
+
then schema-validates every reconverted ioc.yaml with
|
|
39
40
|
`ibek runtime generate2 --no-pvi` inside one EPICS_ROOT tempdir.
|
|
40
41
|
|
|
41
42
|
Flags: `--no-validate` skips the generate2 pass; `--only <ioc-name>`
|
|
@@ -70,6 +70,11 @@ filename and its contents (e.g. "Geobrick 06", "Vacuum system",
|
|
|
70
70
|
uv run builder2ibek xml2yaml $1 --yaml $INSTANCE_DIR/config/ioc.yaml --description "<description>"
|
|
71
71
|
```
|
|
72
72
|
|
|
73
|
+
Add `--blgui` only when the target generic IOC's binary includes the BLGui
|
|
74
|
+
module (e.g. RTEMS / DLS-build hybrids): it emits `BLGui.status` and
|
|
75
|
+
`BLGui.device` for the XML's `auto_BLGui_*` entities. Without it they are
|
|
76
|
+
dropped.
|
|
77
|
+
|
|
73
78
|
### 1d. Review ioc.yaml and fix converters
|
|
74
79
|
|
|
75
80
|
Read the generated `ioc.yaml`. **Do not read large referenced files yet** —
|
|
@@ -29,7 +29,14 @@ The public module at `ibek-support/iocStats/` defines
|
|
|
29
29
|
Do **not** create a `ibek-support-dls/devIocStats/` — the DLS-specific
|
|
30
30
|
copy was removed as redundant.
|
|
31
31
|
|
|
32
|
-
## `autosave` — already converted;
|
|
32
|
+
## `autosave` — already converted; don't add DLS `dlssr*` entities to `ibek-support`
|
|
33
|
+
|
|
34
|
+
A hybrid RTEMS IOC is the one case that differs. Its binary and db come from the
|
|
35
|
+
DLS `autosave` build, so the `dlssr*` templates are available to it, and with
|
|
36
|
+
`autosave.Autosave` it serves `$(P)SR_status` rather than the `$(device):SRSTATUS`
|
|
37
|
+
names its VxWorks IOC had. Any client still reading those names sees nothing. If
|
|
38
|
+
one needs them, the models belong in `ibek-support-dls` under their own module
|
|
39
|
+
name, because upstream `autosave` has no such templates.
|
|
33
40
|
|
|
34
41
|
`autosave` needs **no new entity models**. The converter at
|
|
35
42
|
`src/builder2ibek/converters/autosave.py` already maps
|
|
@@ -17,9 +17,15 @@ Two real examples, both found this way and neither visible in a diff:
|
|
|
17
17
|
`{ "SPACE-01:PIRGG", "BL21I-VA-PIRG-01", "BL21I-VA-PIRG-02" }`. Every gauge,
|
|
18
18
|
img and pirg link in every vacuum space group pointed at a PV that can never
|
|
19
19
|
connect. It had been that way for every converted vacuum IOC.
|
|
20
|
-
- **`vacuumSpace.spaceGroup`
|
|
21
|
-
`databases` block. Builder emits 6 rows for a super-space; we
|
|
22
|
-
to diff, so nothing to notice (builder2ibek#133).
|
|
20
|
+
- **`vacuumSpace.spaceGroup` emitted nothing at all** — parameters but no
|
|
21
|
+
`databases` block. Builder emits 6 rows for a super-space; we emitted 0.
|
|
22
|
+
Nothing to diff, so nothing to notice (builder2ibek#133). The converter now
|
|
23
|
+
expands it the same way as `space`, linking each child space's group PV.
|
|
24
|
+
Known, deliberate divergence: builder picks the mks937a group models for the
|
|
25
|
+
super-space whenever mks937a is in the project RELEASE; the converter only
|
|
26
|
+
does so when the IOC has `mks937a.*` entities. An all-mks937b IOC therefore
|
|
27
|
+
gets `mks937bImgGroup`/`mks937bPirgGroup` super-space rows where prod has
|
|
28
|
+
the mks937a ones. That difference is expected, not a regression.
|
|
23
29
|
|
|
24
30
|
## The check
|
|
25
31
|
|
|
@@ -39,5 +39,9 @@ for src in /dls /dls_sw; do
|
|
|
39
39
|
# bindfs adds allow_other by default, which fusermount refuses unless
|
|
40
40
|
# /etc/fuse.conf has user_allow_other. Not needed under rootless podman:
|
|
41
41
|
# container root maps to this UID, which owns the mount.
|
|
42
|
-
bindfs
|
|
42
|
+
# bindfs always has the kernel check mode bits (default_permissions) and
|
|
43
|
+
# does not pass NFS ACLs through, so ACL-granted visit directories would
|
|
44
|
+
# read as Permission denied. --perms=a+rX shows everything as readable;
|
|
45
|
+
# the daemon then reads as this user and the NFS server applies the ACLs.
|
|
46
|
+
bindfs -r --no-allow-other --perms=a+rX "$src" "$mnt"
|
|
43
47
|
done
|
|
@@ -29,9 +29,15 @@ jobs:
|
|
|
29
29
|
- name: Check for packaging errors
|
|
30
30
|
run: uvx twine check --strict dist/*
|
|
31
31
|
|
|
32
|
+
# The runner's system python can be older than requires-python, so
|
|
33
|
+
# install into a venv on the version named in .python-version.
|
|
32
34
|
- name: Install produced wheel
|
|
33
|
-
run:
|
|
35
|
+
run: >
|
|
36
|
+
uv venv "$RUNNER_TEMP/wheel-venv" &&
|
|
37
|
+
uv pip install --python "$RUNNER_TEMP/wheel-venv" dist/*.whl
|
|
34
38
|
|
|
35
39
|
- name: Test module --version works using the installed wheel
|
|
36
40
|
# If more than one module in src/ replace with module name to test
|
|
37
|
-
run:
|
|
41
|
+
run: >
|
|
42
|
+
"$RUNNER_TEMP/wheel-venv/bin/python"
|
|
43
|
+
-m $(ls --hide='*.egg-info' src | head -1) --version
|
|
@@ -10,6 +10,10 @@ Converts DLS XMLbuilder EPICS IOC definitions to ibek YAML.
|
|
|
10
10
|
- Install files are `*.install.yml` (not `.yaml`).
|
|
11
11
|
- Converters are auto-discovered from `src/builder2ibek/converters/*.py` — no registration needed.
|
|
12
12
|
- Find dependency init calls (e.g. `drvAsynIPPortConfigure`) in real boot scripts, not example ones.
|
|
13
|
+
- **Never start an IOC from a real instance config as a test, locally or in CI, without telling the user first.** Starting one because the user asked is fine. Real configs hold the addresses of live devices, and many IOCs write settings to their devices as they start. To validate one, run `/epics/ioc/start.sh --test` in the image: it generates the startup script and database, then stops without launching the IOC. Before using it, check that the image's `ioc/start.sh` handles `--test` (ioc-template 4.7.0 or later) and that the config has no `start.sh` of its own: an older script ignores the flag and starts the IOC, and a config's `start.sh` takes over. A test config that does start an IOC, such as `tests/config/ioc.yaml`, must use loopback for every device address: check its generated `st.cmd`.
|
|
14
|
+
- **A CI job runs outside the sandbox.** Don't push a branch or job to run something you couldn't run here, and don't create scratch CI jobs without telling the user first.
|
|
15
|
+
- **Do PRs and releases in a background subagent**: pushing, opening the PR, watching CI, merging, tagging and waiting for images. That keeps the main thread free to talk to the user. If a permission check stops a subagent merging, it reports that and the user decides; the main thread doesn't watch CI.
|
|
16
|
+
- **Do searches the user asks for in a background subagent**, so the conversation can continue and the main context stays clean. That covers usage counts, sweeps of `/dls_sw`, and code or web searches. The subagent returns the conclusion and its limits, not the raw output.
|
|
13
17
|
- **No duplicate modules** across `ibek-support/` and `ibek-support-dls/` — each module lives in exactly one. Always check both before creating a new folder. Sole exception: a forked module (e.g. `ether_ip` / `ether_ip_dls`) may appear in both when the two `*.ibek.support.yaml` are byte-identical and only `install.yml` differs — an IOC builds exactly one of them.
|
|
14
18
|
|
|
15
19
|
## Services Repo
|
|
@@ -33,6 +37,7 @@ Converts DLS XMLbuilder EPICS IOC definitions to ibek YAML.
|
|
|
33
37
|
| `ibek-support-dls/<module>/` | DLS entity models + install.yml |
|
|
34
38
|
| `ibek-support/<module>/` | Community entity models |
|
|
35
39
|
| `src/builder2ibek/converters/` | XML converters (one per module) |
|
|
40
|
+
| `tools/pvi-from-edm/` | Separate tool: PVI from EDM screens, see its README |
|
|
36
41
|
|
|
37
42
|
Find IOC XMLs using a module:
|
|
38
43
|
```bash
|
|
@@ -44,6 +49,7 @@ grep -i <module> $(find /dls_sw/work/R3.14.12.7/support/*BUILDER/etc/makeIocs -m
|
|
|
44
49
|
```bash
|
|
45
50
|
# Convert a single IOC XML to ibek YAML:
|
|
46
51
|
uv run builder2ibek xml2yaml <path/to/IOC.xml> --yaml <output/ioc.yaml>
|
|
52
|
+
# --blgui emit BLGui.status/device; only when the generic IOC binary has BLGui
|
|
47
53
|
|
|
48
54
|
# Testing:
|
|
49
55
|
uv run pytest
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
# The devcontainer should use the developer target and run as root with podman
|
|
2
|
+
# or docker with user namespaces.
|
|
3
|
+
#
|
|
4
|
+
# epics-containers/epics-base's own `developer` stage is built FROM DLS's
|
|
5
|
+
# ubuntu-devcontainer (oh-my-zsh, gh/glab/lazygit/just, terminal-config wiring,
|
|
6
|
+
# uv), then adds a real EPICS base + pvxs build under /epics and msi at
|
|
7
|
+
# $EPICS_BASE/bin/<arch>/msi -- which update-schema, the test suite and the
|
|
8
|
+
# vdct-conversion skill's validation steps already assume exists at the
|
|
9
|
+
# default EPICS_ROOT=/epics. Using it directly means nothing from
|
|
10
|
+
# ubuntu-devcontainer needs to be re-added here.
|
|
11
|
+
#
|
|
12
|
+
# This pins to the LTS Ubuntu ("noble") that epics-base's published image was
|
|
13
|
+
# built against, not DLS's newer `resolute` -- there is no published
|
|
14
|
+
# epics-base-developer image built on `resolute` today. See
|
|
15
|
+
# https://github.com/epics-containers/epics-base/blob/main/Dockerfile
|
|
16
|
+
#
|
|
17
|
+
# To bump: check published tags with
|
|
18
|
+
# curl -sL "https://ghcr.io/token?scope=repository:epics-containers/epics-base-developer:pull" \
|
|
19
|
+
# | grep -o '"token":"[^"]*"' | cut -d'"' -f4 | xargs -I{} \
|
|
20
|
+
# curl -sL -H "Authorization: Bearer {}" \
|
|
21
|
+
# https://ghcr.io/v2/epics-containers/epics-base-developer/tags/list
|
|
22
|
+
FROM ghcr.io/epics-containers/epics-base-developer:7.0.10ec5 AS developer
|
|
23
|
+
|
|
24
|
+
# Add any system dependencies for the developer/build environment here
|
|
25
|
+
RUN apt-get update -y && apt-get install -y --no-install-recommends \
|
|
26
|
+
bind9-dnsutils \
|
|
27
|
+
ca-certificates \
|
|
28
|
+
curl \
|
|
29
|
+
iproute2 \
|
|
30
|
+
iputils-ping \
|
|
31
|
+
jq \
|
|
32
|
+
netcat-openbsd \
|
|
33
|
+
openssl \
|
|
34
|
+
tcpdump \
|
|
35
|
+
traceroute \
|
|
36
|
+
unzip \
|
|
37
|
+
&& apt-get dist-clean
|
|
38
|
+
|
|
39
|
+
# Kubernetes CLI tools, linux/amd64 only. To upgrade one, change its version and
|
|
40
|
+
# take the new sha256 from the checksum file published with that release.
|
|
41
|
+
# kubectl stays within one minor version of the clusters. kubelogin is installed
|
|
42
|
+
# under the name that kubeconfigs invoke it by: kubectl oidc-login.
|
|
43
|
+
ARG KUBECTL_VERSION=1.36.6
|
|
44
|
+
ARG KUBECTL_SHA256=29818b6729dc9262b692307470d0558d027725e738be5dd47c760261868a2634
|
|
45
|
+
ARG HELM_VERSION=4.3.1
|
|
46
|
+
ARG HELM_SHA256=0403a88ae20913d11b10a2467b50087721fea7581736da6b9d3992f5357fe54b
|
|
47
|
+
ARG K9S_VERSION=0.51.0
|
|
48
|
+
ARG K9S_SHA256=c3752ad51a5a4015a113819c4eeb6e55a4d0e4b8e652494797532f6fc8161dd7
|
|
49
|
+
ARG STERN_VERSION=1.35.0
|
|
50
|
+
ARG STERN_SHA256=03729b01a8fcfab25f6ea53389bd38bc37400ff86d90cd2dcda541f248cf843e
|
|
51
|
+
ARG KUBELOGIN_VERSION=1.36.4
|
|
52
|
+
ARG KUBELOGIN_SHA256=9e8baeb4905d35a301304af2548324997add512fe94ab20e65993d167212bf85
|
|
53
|
+
ARG ARGOCD_VERSION=3.5.7
|
|
54
|
+
ARG ARGOCD_SHA256=e9b7c3f5316b8546bdd499dfb8d874e413a5e3605899a55ec2ce0b668a3e2801
|
|
55
|
+
ARG YQ_VERSION=4.54.1
|
|
56
|
+
ARG YQ_SHA256=8e34fc298390875de416e6a4afcb8cabeceb25d9aa8506c1a2f9353cf702ea5f
|
|
57
|
+
|
|
58
|
+
RUN set -eu; \
|
|
59
|
+
tmp=$(mktemp -d); cd "$tmp"; \
|
|
60
|
+
fetch() { curl -fsSL -o "$1" "$2"; echo "$3 $1" | sha256sum -c -; }; \
|
|
61
|
+
github=https://github.com; \
|
|
62
|
+
fetch kubectl "https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl" "$KUBECTL_SHA256"; \
|
|
63
|
+
fetch helm.tgz "https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz" "$HELM_SHA256"; \
|
|
64
|
+
fetch k9s.tgz "$github/derailed/k9s/releases/download/v${K9S_VERSION}/k9s_Linux_amd64.tar.gz" "$K9S_SHA256"; \
|
|
65
|
+
fetch stern.tgz "$github/stern/stern/releases/download/v${STERN_VERSION}/stern_${STERN_VERSION}_linux_amd64.tar.gz" "$STERN_SHA256"; \
|
|
66
|
+
fetch kubelogin.zip "$github/int128/kubelogin/releases/download/v${KUBELOGIN_VERSION}/kubelogin_linux_amd64.zip" "$KUBELOGIN_SHA256"; \
|
|
67
|
+
fetch argocd "$github/argoproj/argo-cd/releases/download/v${ARGOCD_VERSION}/argocd-linux-amd64" "$ARGOCD_SHA256"; \
|
|
68
|
+
fetch yq "$github/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_amd64" "$YQ_SHA256"; \
|
|
69
|
+
tar xzf helm.tgz --no-same-owner --strip-components=1 linux-amd64/helm; \
|
|
70
|
+
tar xzf k9s.tgz --no-same-owner k9s; \
|
|
71
|
+
tar xzf stern.tgz --no-same-owner stern; \
|
|
72
|
+
unzip -q kubelogin.zip kubelogin; \
|
|
73
|
+
install -m 0755 kubectl helm k9s stern argocd yq /usr/local/bin/; \
|
|
74
|
+
install -m 0755 kubelogin /usr/local/bin/kubectl-oidc_login; \
|
|
75
|
+
cd /; rm -rf "$tmp"
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: builder2ibek
|
|
3
|
-
Version: 2.
|
|
3
|
+
Version: 2.4.0
|
|
4
4
|
Summary: Conversion tool for DLS XML builder IOC instances to ibek ioc.yaml
|
|
5
5
|
Author-email: Giles Knap <giles.knap@diamond.ac.uk>
|
|
6
6
|
License: Apache License
|
|
@@ -210,7 +210,7 @@ Classifier: Development Status :: 3 - Alpha
|
|
|
210
210
|
Classifier: License :: OSI Approved :: Apache Software License
|
|
211
211
|
Classifier: Programming Language :: Python :: 3.13
|
|
212
212
|
Classifier: Programming Language :: Python :: 3.14
|
|
213
|
-
Requires-Python: >=3.
|
|
213
|
+
Requires-Python: >=3.13
|
|
214
214
|
Description-Content-Type: text/markdown
|
|
215
215
|
License-File: LICENSE
|
|
216
216
|
Requires-Dist: ibek
|
|
@@ -263,6 +263,31 @@ Regenerate expected outputs and schema:
|
|
|
263
263
|
See [golden-file tests](https://github.com/epics-containers/builder2ibek/blob/main/docs/explanations/golden-file-tests.md)
|
|
264
264
|
for how the baselines are reviewed and committed.
|
|
265
265
|
|
|
266
|
+
## Bumping the ibek-support submodules
|
|
267
|
+
|
|
268
|
+
CI can't reach `ibek-support-dls` on Diamond's GitLab, so the support YAMLs the
|
|
269
|
+
samples need are vendored into `tests/vendored-support-dls/`. After moving the
|
|
270
|
+
`ibek-support-dls` pin, refresh that copy in the same commit:
|
|
271
|
+
|
|
272
|
+
```bash
|
|
273
|
+
git -C ibek-support-dls checkout <sha>
|
|
274
|
+
git add ibek-support-dls
|
|
275
|
+
git commit -m "Bump ibek-support-dls to <sha>"
|
|
276
|
+
python3 tests/vendor_support_dls.py --update
|
|
277
|
+
git add tests/vendored-support-dls
|
|
278
|
+
git commit --amend --no-edit
|
|
279
|
+
uv run pytest
|
|
280
|
+
```
|
|
281
|
+
|
|
282
|
+
`--update` only runs once the new pin is committed, and two guard tests compare
|
|
283
|
+
against the committed pin, not a staged one. So the suite stays red until both
|
|
284
|
+
steps are done. If the tests show sample differences, regenerate with
|
|
285
|
+
`./tests/samples/make_samples.sh` and review the diff before committing. A bump
|
|
286
|
+
of `ibek-support` alone needs only the commit and the tests.
|
|
287
|
+
|
|
288
|
+
See [testing and CI](https://github.com/epics-containers/builder2ibek/blob/main/.claude/skills/shared/testing-and-ci.md)
|
|
289
|
+
for the details and the guards.
|
|
290
|
+
|
|
266
291
|
<!-- README only content. Anything below this line won't be included in index.md -->
|
|
267
292
|
|
|
268
293
|
<pre><font color="#AAAAAA">╭─ Commands ───────────────────────────────────────────────────────────────────╮</font>
|
|
@@ -45,6 +45,31 @@ Regenerate expected outputs and schema:
|
|
|
45
45
|
See [golden-file tests](https://github.com/epics-containers/builder2ibek/blob/main/docs/explanations/golden-file-tests.md)
|
|
46
46
|
for how the baselines are reviewed and committed.
|
|
47
47
|
|
|
48
|
+
## Bumping the ibek-support submodules
|
|
49
|
+
|
|
50
|
+
CI can't reach `ibek-support-dls` on Diamond's GitLab, so the support YAMLs the
|
|
51
|
+
samples need are vendored into `tests/vendored-support-dls/`. After moving the
|
|
52
|
+
`ibek-support-dls` pin, refresh that copy in the same commit:
|
|
53
|
+
|
|
54
|
+
```bash
|
|
55
|
+
git -C ibek-support-dls checkout <sha>
|
|
56
|
+
git add ibek-support-dls
|
|
57
|
+
git commit -m "Bump ibek-support-dls to <sha>"
|
|
58
|
+
python3 tests/vendor_support_dls.py --update
|
|
59
|
+
git add tests/vendored-support-dls
|
|
60
|
+
git commit --amend --no-edit
|
|
61
|
+
uv run pytest
|
|
62
|
+
```
|
|
63
|
+
|
|
64
|
+
`--update` only runs once the new pin is committed, and two guard tests compare
|
|
65
|
+
against the committed pin, not a staged one. So the suite stays red until both
|
|
66
|
+
steps are done. If the tests show sample differences, regenerate with
|
|
67
|
+
`./tests/samples/make_samples.sh` and review the diff before committing. A bump
|
|
68
|
+
of `ibek-support` alone needs only the commit and the tests.
|
|
69
|
+
|
|
70
|
+
See [testing and CI](https://github.com/epics-containers/builder2ibek/blob/main/.claude/skills/shared/testing-and-ci.md)
|
|
71
|
+
for the details and the guards.
|
|
72
|
+
|
|
48
73
|
<!-- README only content. Anything below this line won't be included in index.md -->
|
|
49
74
|
|
|
50
75
|
<pre><font color="#AAAAAA">╭─ Commands ───────────────────────────────────────────────────────────────────╮</font>
|
|
@@ -69,6 +69,15 @@ Each XML element maps to an ibek entity type: `<module.Class attribute="value"/>
|
|
|
69
69
|
uv run builder2ibek xml2yaml BL11I-CS-IOC-09.xml --yaml bl11i-cs-ioc-09.yaml
|
|
70
70
|
```
|
|
71
71
|
|
|
72
|
+
BLGui entities (`auto_BLGui_status`, `auto_BLGui_device`) are dropped unless
|
|
73
|
+
you pass `--blgui`. Pass it only when the generic IOC binary includes the
|
|
74
|
+
BLGui module; it then emits `BLGui.status` and `BLGui.device`.
|
|
75
|
+
`builder2ibek reconvert` passes `--blgui` itself for each IOC whose existing
|
|
76
|
+
`ioc.yaml` contains `BLGui.*` entities, so it regenerates them from the XML.
|
|
77
|
+
BLGui entities added to `ioc.yaml` by hand are not kept. If that file cannot be
|
|
78
|
+
parsed it warns and reconverts without `--blgui`. There is no
|
|
79
|
+
option to force this on or off.
|
|
80
|
+
|
|
72
81
|
For the example above this produces `bl11i-cs-ioc-09.yaml`:
|
|
73
82
|
|
|
74
83
|
```yaml
|
|
@@ -151,15 +151,20 @@ ilkE → ilk14
|
|
|
151
151
|
ilkF → ilk15
|
|
152
152
|
```
|
|
153
153
|
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
154
|
+
`interlock.interlock` `addr` is a 10-word block number in the PLC DM area
|
|
155
|
+
(block `nn` starts at DM `nn×10`); `dlsPLC.interlock` `addr` is the first DM
|
|
156
|
+
address. The converter multiplies by 10:
|
|
157
157
|
|
|
158
158
|
```
|
|
159
|
-
# Old: addr=07
|
|
160
|
-
# New: addr=
|
|
159
|
+
# Old: addr=07 → reads BLOCK07 = DM70..79
|
|
160
|
+
# New: addr=70
|
|
161
161
|
```
|
|
162
162
|
|
|
163
|
+
`dlsPLC.interlock` reads its words from the `$(device):DM<century>XX` records
|
|
164
|
+
of a `dlsPLC.read100` for century `addr ÷ 100` (e.g. `addr=390` needs
|
|
165
|
+
century 3). The converter adds a `dlsPLC.read100` for that device and century,
|
|
166
|
+
on the interlock's port, unless the IOC already has one.
|
|
167
|
+
|
|
163
168
|
### `overrideRequestMain` — `outaddr`
|
|
164
169
|
|
|
165
170
|
The three arguments `addr`, `in`, `out` collapse into a single `outaddr`:
|
|
@@ -277,7 +282,7 @@ in builder XML; ibek uses the `device` PV name instead).
|
|
|
277
282
|
**New ioc.yaml** (ilkA–ilkF → ilk10–ilk15; blank fields dropped):
|
|
278
283
|
```yaml
|
|
279
284
|
- type: dlsPLC.interlock
|
|
280
|
-
addr:
|
|
285
|
+
addr: 70
|
|
281
286
|
desc: Water Flow Interlocks
|
|
282
287
|
device: BL04I-VA-VLVCC-01
|
|
283
288
|
ilk0: I04 Filter
|
|
@@ -347,7 +352,8 @@ The following conversions happen without manual intervention when you run
|
|
|
347
352
|
| `vacuumValve.vacuumValveRead` → `dlsPLC.read100` (century=0) | `converters/vacuumValve.py` |
|
|
348
353
|
| `vacuumValve.vacuumValve` / `vacuumValve_callback` → `dlsPLC.vacValve` with `valve×10` | `converters/vacuumValve.py` |
|
|
349
354
|
| `vacuumValve.vacuumValveGroup` → `dlsPLC.vacValveGroup` | `converters/vacuumValve.py` |
|
|
350
|
-
| `interlock.interlock` → `dlsPLC.interlock` with hex→int on ilk fields | `converters/interlock.py` |
|
|
355
|
+
| `interlock.interlock` → `dlsPLC.interlock` with `addr×10` and hex→int on ilk fields | `converters/interlock.py` |
|
|
356
|
+
| `dlsPLC.read100` added for each `dlsPLC.interlock` century the IOC does not already read | `converters/interlock.py` |
|
|
351
357
|
| `interlock.overrideRequestMain` → `dlsPLC.overrideRequestMain` with outaddr | `converters/interlock.py` |
|
|
352
358
|
| `interlock.overrideRequestIndividual` → `dlsPLC.overrideRequestIndividual` (FIELD dropped) | `converters/interlock.py` |
|
|
353
359
|
| Blank `ilk*` fields dropped from all dlsPLC entities | `converters/dlsPLC.py` |
|
|
@@ -15,7 +15,7 @@ dependencies = ["ibek"] # Add project dependencies here, e.g. ["click", "numpy"]
|
|
|
15
15
|
dynamic = ["version"]
|
|
16
16
|
license.file = "LICENSE"
|
|
17
17
|
readme = "README.md"
|
|
18
|
-
requires-python = ">=3.
|
|
18
|
+
requires-python = ">=3.13"
|
|
19
19
|
|
|
20
20
|
[dependency-groups]
|
|
21
21
|
dev = [
|
|
@@ -152,6 +152,7 @@ commands = [
|
|
|
152
152
|
|
|
153
153
|
[tool.ruff]
|
|
154
154
|
src = ["src", "tests"]
|
|
155
|
+
extend-exclude = ["tools"] # standalone tools keep their own style and tests
|
|
155
156
|
lint.ignore = [
|
|
156
157
|
"C408", # Unnecessary collection call - e.g. list(...) instead of [...]
|
|
157
158
|
"UP007", # Do not complain about Optional[] (TODO: remove once typer is patched)
|
|
@@ -43,11 +43,18 @@ def xml2yaml(
|
|
|
43
43
|
"",
|
|
44
44
|
help="Short description of the IOC's device (e.g. 'Geobrick 06')",
|
|
45
45
|
),
|
|
46
|
+
blgui: bool = typer.Option(
|
|
47
|
+
False,
|
|
48
|
+
"--blgui/--no-blgui",
|
|
49
|
+
help="Emit BLGui.status / BLGui.device entities (DEVSTA and INFO PVs). "
|
|
50
|
+
"Only for generic IOCs whose binary includes the BLGui module; "
|
|
51
|
+
"otherwise BLGui entities are dropped.",
|
|
52
|
+
),
|
|
46
53
|
):
|
|
47
54
|
if not yaml:
|
|
48
55
|
yaml = xml.absolute().with_suffix("yaml")
|
|
49
56
|
|
|
50
|
-
convert_file(xml, yaml, schema, description=description)
|
|
57
|
+
convert_file(xml, yaml, schema, description=description, blgui=blgui)
|
|
51
58
|
|
|
52
59
|
|
|
53
60
|
@cli.command()
|
|
@@ -195,7 +202,9 @@ def reconvert(
|
|
|
195
202
|
"""
|
|
196
203
|
Re-run xml2yaml on all IOCs for a beamline's services repo and
|
|
197
204
|
optionally schema-validate each result with ibek generate2. Sequential
|
|
198
|
-
inside one EPICS_ROOT tempdir.
|
|
205
|
+
inside one EPICS_ROOT tempdir. An IOC whose existing ioc.yaml has
|
|
206
|
+
BLGui.* entities is reconverted with --blgui, which
|
|
207
|
+
regenerates them from the XML.
|
|
199
208
|
"""
|
|
200
209
|
reconvert_cli(
|
|
201
210
|
beamline,
|
|
@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
|
|
|
18
18
|
commit_id: str | None
|
|
19
19
|
__commit_id__: str | None
|
|
20
20
|
|
|
21
|
-
__version__ = version = '2.
|
|
22
|
-
__version_tuple__ = version_tuple = (2,
|
|
21
|
+
__version__ = version = '2.4.0'
|
|
22
|
+
__version_tuple__ = version_tuple = (2, 4, 0)
|
|
23
23
|
|
|
24
|
-
__commit_id__ = commit_id = '
|
|
24
|
+
__commit_id__ = commit_id = 'g8c07e9e1a'
|
|
@@ -14,7 +14,9 @@ from builder2ibek.support_defaults import strip_defaults
|
|
|
14
14
|
from builder2ibek.types import Entity, Generic_IOC
|
|
15
15
|
|
|
16
16
|
|
|
17
|
-
def convert_file(
|
|
17
|
+
def convert_file(
|
|
18
|
+
xml: Path, yaml: Path, schema: str, description: str = "", blgui: bool = False
|
|
19
|
+
):
|
|
18
20
|
def tidy_up(yaml):
|
|
19
21
|
# add blank lines between major fields
|
|
20
22
|
for field in [
|
|
@@ -27,9 +29,11 @@ def convert_file(xml: Path, yaml: Path, schema: str, description: str = ""):
|
|
|
27
29
|
return yaml
|
|
28
30
|
|
|
29
31
|
"""Convert a single builder XML file into a single ibek YAML"""
|
|
32
|
+
yaml.parent.mkdir(parents=True, exist_ok=True)
|
|
33
|
+
|
|
30
34
|
builder = Builder()
|
|
31
35
|
builder.load(xml)
|
|
32
|
-
ioc = dispatch(builder, xml, description=description)
|
|
36
|
+
ioc = dispatch(builder, xml, yaml.parent, description=description, blgui=blgui)
|
|
33
37
|
|
|
34
38
|
ruamel = YAML()
|
|
35
39
|
|
|
@@ -43,16 +47,23 @@ def convert_file(xml: Path, yaml: Path, schema: str, description: str = ""):
|
|
|
43
47
|
|
|
44
48
|
ruamel.indent(mapping=2, sequence=4, offset=2)
|
|
45
49
|
|
|
46
|
-
yaml.parent.mkdir(parents=True, exist_ok=True)
|
|
47
|
-
|
|
48
50
|
with yaml.open("w") as stream:
|
|
49
51
|
ruamel.dump(yaml_map, stream, transform=tidy_up)
|
|
50
52
|
|
|
51
53
|
|
|
52
|
-
def dispatch(
|
|
54
|
+
def dispatch(
|
|
55
|
+
builder: Builder,
|
|
56
|
+
filename,
|
|
57
|
+
out_dir: Path | None = None,
|
|
58
|
+
description: str = "",
|
|
59
|
+
blgui: bool = False,
|
|
60
|
+
) -> Generic_IOC:
|
|
53
61
|
"""
|
|
54
62
|
Dispatch every element in the XML to the correct convertor
|
|
55
63
|
and build a generic IOC from the converted Entities
|
|
64
|
+
|
|
65
|
+
out_dir is the folder the converted YAML is written to; convertors that
|
|
66
|
+
generate additional files write them there.
|
|
56
67
|
"""
|
|
57
68
|
if not description:
|
|
58
69
|
description = (
|
|
@@ -76,6 +87,8 @@ def dispatch(builder: Builder, filename, description: str = "") -> Generic_IOC:
|
|
|
76
87
|
{"type": "devIocStats.iocAdminSoft", "IOC": "{{ ioc_name | upper }}"},
|
|
77
88
|
],
|
|
78
89
|
source_file=filename,
|
|
90
|
+
out_dir=out_dir or Path(),
|
|
91
|
+
blgui=blgui,
|
|
79
92
|
)
|
|
80
93
|
|
|
81
94
|
do_dispatch(builder, ioc)
|
|
@@ -102,10 +115,23 @@ def do_dispatch(builder: Builder, ioc: Generic_IOC):
|
|
|
102
115
|
|
|
103
116
|
ioc.already_converted.append(entity)
|
|
104
117
|
|
|
118
|
+
param_orders = {
|
|
119
|
+
info.yaml_component: info.param_order for info in module_infos.values()
|
|
120
|
+
}
|
|
121
|
+
|
|
105
122
|
sorted_entities: list[Entity] = []
|
|
106
123
|
for entity in ioc.entities: # type: ignore
|
|
107
|
-
# sort the args by
|
|
108
|
-
|
|
124
|
+
# sort the args by the module's param_order, then alphabetically
|
|
125
|
+
order = param_orders.get(str(entity["type"]).split(".")[0], [])
|
|
126
|
+
entity = Entity(
|
|
127
|
+
sorted(
|
|
128
|
+
entity.items(),
|
|
129
|
+
key=lambda kv: (
|
|
130
|
+
order.index(kv[0]) if kv[0] in order else len(order),
|
|
131
|
+
kv[0],
|
|
132
|
+
),
|
|
133
|
+
)
|
|
134
|
+
) # type: ignore
|
|
109
135
|
# but move type to the start of each entity
|
|
110
136
|
entity = Entity(type=entity.pop("type"), **entity)
|
|
111
137
|
sorted_entities.append(entity)
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
from builder2ibek.converters.globalHandler import globalHandler
|
|
2
|
+
from builder2ibek.types import Entity, Generic_IOC
|
|
3
|
+
from builder2ibek.utils import is_jinja
|
|
4
|
+
|
|
5
|
+
xml_component = "BLGui"
|
|
6
|
+
|
|
7
|
+
# parameter types of the BLGui entity models in ibek-support-dls
|
|
8
|
+
STATUS_STR = ["P", "CALC"] + [f"INP{c}" for c in "ABCDEFGHIJKL"]
|
|
9
|
+
STATUS_INT = ["PHAS"]
|
|
10
|
+
DEVICE_STR = ["P", "SHORTNAME", "DESCRIPTION", "GDA_NAME", "GDA_DESC", "BL_SECTION"]
|
|
11
|
+
DEVICE_INT = ["NFLOW", "NTEMP", "NCURR", "MTYPE", "BL_ORDER"]
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
def _coerce(entity: Entity, str_params: list[str], int_params: list[str]):
|
|
15
|
+
# the generic converter turns numeric-looking XML values into numbers
|
|
16
|
+
# (e.g. CALC="0", INPA="0") and keeps zero-padded ones as strings
|
|
17
|
+
for p in str_params:
|
|
18
|
+
if entity.get(p) is not None:
|
|
19
|
+
entity[p] = str(entity[p])
|
|
20
|
+
for p in int_params:
|
|
21
|
+
# a cross-reference such as $(NTEMP) arrives as a Jinja string that
|
|
22
|
+
# ibek renders; leave it for ibek to resolve
|
|
23
|
+
if entity.get(p) is not None and not is_jinja(entity[p]):
|
|
24
|
+
entity[p] = int(entity[p])
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
@globalHandler
|
|
28
|
+
def handler(entity: Entity, entity_type: str, ioc: Generic_IOC):
|
|
29
|
+
"""
|
|
30
|
+
XML to YAML specialist convertor function for the BLGui support module
|
|
31
|
+
|
|
32
|
+
By default every BLGui entity is dropped: most generic IOC images do not
|
|
33
|
+
include the BLGui module, so its entities would fail schema validation.
|
|
34
|
+
|
|
35
|
+
With `xml2yaml --blgui` (for generic IOCs whose binary includes BLGui,
|
|
36
|
+
such as the RTEMS / DLS-build hybrids) auto_BLGui_status and
|
|
37
|
+
auto_BLGui_device become BLGui.status and BLGui.device: they serve the
|
|
38
|
+
DEVSTA / INFO PVs that synoptic screens read. The other BLGui entities
|
|
39
|
+
are EDM display support only and are dropped either way.
|
|
40
|
+
"""
|
|
41
|
+
# name is a gui association label, not referenced by other entities
|
|
42
|
+
entity.remove("name")
|
|
43
|
+
|
|
44
|
+
if not ioc.blgui:
|
|
45
|
+
entity.delete_me()
|
|
46
|
+
|
|
47
|
+
elif entity_type == "auto_BLGui_status":
|
|
48
|
+
entity.type = "BLGui.status"
|
|
49
|
+
_coerce(entity, STATUS_STR, STATUS_INT)
|
|
50
|
+
|
|
51
|
+
elif entity_type == "auto_BLGui_device":
|
|
52
|
+
entity.type = "BLGui.device"
|
|
53
|
+
# some XMLs omit BL_SECTION / BL_ORDER; the model requires both, and
|
|
54
|
+
# they only feed a gda comment tag in BLGui-device.template.
|
|
55
|
+
if entity.get("BL_SECTION") is None:
|
|
56
|
+
entity.BL_SECTION = ""
|
|
57
|
+
if entity.get("BL_ORDER") is None:
|
|
58
|
+
entity.BL_ORDER = 0
|
|
59
|
+
_coerce(entity, DEVICE_STR, DEVICE_INT)
|
|
60
|
+
|
|
61
|
+
else:
|
|
62
|
+
entity.delete_me()
|