Rename system_simulation file to system_component

DiamondLightSource · Sep 13, 2023 · 2b80b08 · 2b80b08
1 parent 7145fba
commit 2b80b08
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/docs/user/explanations/components.rst b/docs/user/explanations/components.rst
@@ -41,7 +41,7 @@ the master scheduler's wiring is correct, for example:
       name: random_trampoline
       inputs: {}
       callback_period: 10000000000
-    - type: tickit.core.components.system_simulation.SystemSimulation
+    - type: tickit.core.components.system_component.SystemSimulation
       name: internal_tickit
       inputs:
         input_1:
@@ -80,5 +80,5 @@ A simulation containing both types of component will look something like this:
 
 
 
-.. _DeviceSimulation: <tickit.core.device_simulation.DeviceComponent>
-.. _SystemSimulationComponent: <tickit.core.system_simulation.SystemComponent>
+.. _DeviceComponent: <tickit.core.components.device_component.DeviceComponent>
+.. _SystemComponent: <tickit.core.components.system_component.SystemComponent>
diff --git a/docs/user/reference/api.rst b/docs/user/reference/api.rst
@@ -56,10 +56,10 @@ This is the internal API reference for tickit
             ``tickit.core.components.device_component``
             --------------------------------------------
 
-        .. automodule:: tickit.core.components.system_simulation
+        .. automodule:: tickit.core.components.system_component
             :members:
 
-            ``tickit.core.components.system_simulation``
+            ``tickit.core.components.system_component``
             --------------------------------------------
 
 

diff --git a/examples/adapters/system_simulation_adapter_config.py b/examples/adapters/system_simulation_adapter_config.py
@@ -6,7 +6,7 @@
 from tickit.adapters.io.tcp_io import TcpIo
 from tickit.core.adapter import AdapterContainer
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.system_simulation import SystemComponent
+from tickit.core.components.system_component import SystemComponent
 from tickit.core.typedefs import ComponentID, ComponentPort, PortID
 
 

diff --git a/examples/configs/nested.yaml b/examples/configs/nested.yaml
@@ -2,7 +2,7 @@
   name: random_trampoline
   inputs: {}
   callback_period: 10000000000
-- type: tickit.core.components.system_simulation.SystemSimulation
+- type: tickit.core.components.system_component.SystemSimulation
   name: internal_tickit
   inputs:
     input_1:

diff --git a/...ckit/core/components/system_simulation.py → ...ickit/core/components/system_component.py b/...ckit/core/components/system_simulation.py → ...ickit/core/components/system_component.py
diff --git a/tests/core/components/test_system_simulation.py b/tests/core/components/test_system_simulation.py
@@ -7,7 +7,7 @@
 from mock.mock import create_autospec
 
 from tickit.core.components.component import Component
-from tickit.core.components.system_simulation import (
+from tickit.core.components.system_component import (
     SystemSimulation,
     SystemComponent,
 )
@@ -39,7 +39,7 @@ def mock_state_consumer_type() -> Mock:
 
 @pytest.fixture
 def patch_scheduler() -> Iterable[Mock]:
-    spec = "tickit.core.components.system_simulation.SlaveScheduler"
+    spec = "tickit.core.components.system_component.SlaveScheduler"
     with patch(spec, autospec=True) as mock:
 
         def on_tick(time, changes):
@@ -72,7 +72,7 @@ def test_system_simulation_constructor(system_simulation: SystemSimulation):
 @pytest.fixture
 def patch_asyncio() -> Iterable[Mock]:
     with patch(
-        "tickit.core.components.system_simulation.asyncio", autospec=True
+        "tickit.core.components.system_component.asyncio", autospec=True
     ) as mock:
         yield mock
 

diff --git a/tests/system_tests/configs/nested.yaml b/tests/system_tests/configs/nested.yaml
@@ -2,7 +2,7 @@
   name: external_source
   inputs: {}
   value: 42
-- type: tickit.core.components.system_simulation.SystemSimulation
+- type: tickit.core.components.system_component.SystemSimulation
   name: internal_tickit
   inputs:
     input_1: 

diff --git a/tests/system_tests/test_with_master_and_slave.py b/tests/system_tests/test_with_master_and_slave.py
@@ -8,7 +8,7 @@
 
 from tickit.core.components.component import Component, ComponentConfig
 from tickit.core.components.device_component import DeviceComponent
-from tickit.core.components.system_simulation import SystemComponent
+from tickit.core.components.system_component import SystemComponent
 from tickit.core.management.event_router import InverseWiring
 from tickit.core.management.schedulers.master import MasterScheduler
 from tickit.core.state_interfaces.state_interface import get_interface