Skip to content

Migrate dt4acc integration to pyaml-test-lattice and pin CS backends #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gupichon merged 3 commits into from
Sep 10, 2026
Merged

Migrate dt4acc integration to pyaml-test-lattice and pin CS backends #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d258196
Migrate dt4acc integration to pyaml-test-lattice and pin CS backends
gupichon-soleil Sep 10, 2026
9da7396
Merge remote-tracking branch 'origin/main' into 394-feature-source-dt…
gupichon-soleil Sep 10, 2026
793bc84
Fix tango-pyaml pin: repoint to the actual multi_attribute fix
gupichon-soleil Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/dt4acc-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ jobs:
python -m pip install -e ".[test]"
python -m pip install "ophyd-async[tango, ca, pva]"
python -m pip install --no-deps \
"tango-pyaml @ git+https://github.com/python-accelerator-middle-layer/tango-pyaml.git" \
"pyaml-cs-oa @ git+https://github.com/python-accelerator-middle-layer/pyaml-cs-oa.git"
"tango-pyaml @ git+https://github.com/python-accelerator-middle-layer/tango-pyaml.git@1f010735bd675ad2f918958abd0396cb6766f14e" \
"pyaml-cs-oa @ git+https://github.com/python-accelerator-middle-layer/pyaml-cs-oa.git@0.2.0"
python -c "import tango; import tango.pyaml; import pyaml_cs_oa"

- name: Log in to GitLab registry
Expand All @@ -85,9 +85,12 @@ jobs:
LOG_FILE="${RUNNER_TEMP}/dt4acc-twin.log"
PID_FILE="${RUNNER_TEMP}/dt4acc-twin.pid"

ACCEL_SETUP_FILE=$(python -c "from pyaml_test_lattice import configurations; print(configurations['dt4acc/fodo_1gev_6d_dt4acc_tango.json'])")
LATTICE_FILE=$(python -c "from pyaml_test_lattice import lattices; print(lattices['fodo_1gev_6d.json'])")

bash tests/integration/start_dt4acc_twin.sh \
--accelerator-setup-file "${GITHUB_WORKSPACE}/tests/integration/data/fodo_1gev_6d/fodo_1gev_6d_dt4acc.json" \
--lattice-file "${GITHUB_WORKSPACE}/tests/integration/data/fodo_1gev_6d/fodo_1gev_6d.json" \
--accelerator-setup-file "${ACCEL_SETUP_FILE}" \
--lattice-file "${LATTICE_FILE}" \
--tango-host "${TANGO_HOST%:*}" \
--tango-port "${TANGO_HOST##*:}" \
--sif "${RUNNER_TEMP}/apptainer/dt4acc-soleil-twin.sif" \
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ 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",
]
doc = [
"sphinx ~= 8.1",
Expand Down
172 changes: 0 additions & 172 deletions tests/integration/data/fodo_1gev_6d.m
View file
Open in desktop

This file was deleted.

Loading
Loading