diff --git a/pyproject.toml b/pyproject.toml index d08503f6a..7e99a8cf6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,7 @@ dependencies = [ "ruamel.yaml", "jinja2", "GitPython", - "pvi>=0.6", + "pvi>=0.7.1", ] # Add project dependencies here, e.g. ["click", "numpy"] dynamic = ["version"] license.file = "LICENSE" diff --git a/tests/generate_samples.sh b/tests/generate_samples.sh index 4878767c2..5b1a874df 100755 --- a/tests/generate_samples.sh +++ b/tests/generate_samples.sh @@ -19,7 +19,7 @@ mkdir -p outputs set -ex mkdir -p epics/pvi-defs -cp support/simple.pvi.device.yaml epics/pvi-defs/Simple.pvi.device.yaml +cp support/simple.pvi.device.yaml epics/pvi-defs/simple.pvi.device.yaml echo making the support yaml schema ibek support generate-schema --output schemas/ibek.support.schema.json diff --git a/tests/samples/epics/pvi-defs/Simple.pvi.device.yaml b/tests/samples/epics/pvi-defs/simple.pvi.device.yaml similarity index 100% rename from tests/samples/epics/pvi-defs/Simple.pvi.device.yaml rename to tests/samples/epics/pvi-defs/simple.pvi.device.yaml diff --git a/tests/samples/outputs/index.bob b/tests/samples/outputs/index.bob index e84244775..c4cc00f77 100644 --- a/tests/samples/outputs/index.bob +++ b/tests/samples/outputs/index.bob @@ -37,7 +37,7 @@ OpenDisplay - Simple.pvi.bob + simple.pvi.bob tab Open Display diff --git a/tests/samples/outputs/motorSim.ioc.subst b/tests/samples/outputs/motorSim.ioc.subst index c8dc802b0..ae8927c8a 100644 --- a/tests/samples/outputs/motorSim.ioc.subst +++ b/tests/samples/outputs/motorSim.ioc.subst @@ -24,7 +24,7 @@ pattern { "IBEK-MO-TST-01:", "3", "asynMotor", "controllerOne", "2", "CS Motor 2", "degrees", "0", "10.0", "10.0", ".01", "20000", "-20000", "" } } -file "Simple.pvi.template" { +file "simple.pvi.template" { pattern { "prefix" } { "IBEK-MO-TST-01::" } diff --git a/tests/samples/outputs/Simple.pvi.bob b/tests/samples/outputs/simple.pvi.bob similarity index 100% rename from tests/samples/outputs/Simple.pvi.bob rename to tests/samples/outputs/simple.pvi.bob diff --git a/tests/samples/support/motorSim.ibek.support.yaml b/tests/samples/support/motorSim.ibek.support.yaml index 672dbfc3f..92a0cbf57 100644 --- a/tests/samples/support/motorSim.ibek.support.yaml +++ b/tests/samples/support/motorSim.ibek.support.yaml @@ -51,7 +51,7 @@ defs: DESC: pvi: - yaml_path: Simple.pvi.device.yaml + yaml_path: simple.pvi.device.yaml prefix: "{{P}}:" pva_template: true index: true diff --git a/tests/test_cli.py b/tests/test_cli.py index b4cd6b11f..55bf2f68b 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -113,8 +113,8 @@ def test_build_runtime_motorSim(tmp_path: Path, samples: Path): actual_index = (samples / "epics" / "opi" / "index.bob").read_text() assert example_index == actual_index - example_pvi = (samples / "outputs" / "Simple.pvi.bob").read_text() - actual_pvi = (samples / "epics" / "opi" / "Simple.pvi.bob").read_text() + example_pvi = (samples / "outputs" / "simple.pvi.bob").read_text() + actual_pvi = (samples / "epics" / "opi" / "simple.pvi.bob").read_text() assert example_pvi == actual_pvi