Rename device_simulation file to device_component

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

Hide file tree

Showing 19 changed files with 20 additions and 20 deletions.
diff --git a/docs/user/reference/api.rst b/docs/user/reference/api.rst
@@ -50,10 +50,10 @@ This is the internal API reference for tickit
             ``tickit.core.components.component``
             ------------------------------------
 
-        .. automodule:: tickit.core.components.device_simulation
+        .. automodule:: tickit.core.components.device_component
             :members:
 
-            ``tickit.core.components.device_simulation``
+            ``tickit.core.components.device_component``
             --------------------------------------------
 
         .. automodule:: tickit.core.components.system_simulation

diff --git a/docs/user/tutorials/create-a-device.rst b/docs/user/tutorials/create-a-device.rst
@@ -127,7 +127,7 @@ if the device requires any adapters to control it externally.
     import pydantic.v1.dataclasses
 
     from tickit.core.components.component import Component, ComponentConfig
-    from tickit.core.components.device_simulation import DeviceComponent
+    from tickit.core.components.device_component import DeviceComponent
 
 
     @pydantic.v1.dataclasses.dataclass

diff --git a/examples/adapters/http_adapter.py b/examples/adapters/http_adapter.py
@@ -6,7 +6,7 @@
 from tickit.adapters.specifications import HttpEndpoint
 from tickit.core.adapter import AdapterContainer
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceComponent
+from tickit.core.components.device_component import DeviceComponent
 from tickit.devices.iobox import IoBoxDevice
 
 

diff --git a/examples/adapters/system_simulation_adapter.py b/examples/adapters/system_simulation_adapter.py
@@ -2,7 +2,7 @@
 from tickit.adapters.system import BaseSystemSimulationAdapter
 from tickit.adapters.tcp import CommandAdapter
 from tickit.core.components.component import BaseComponent
-from tickit.core.components.device_simulation import DeviceComponent
+from tickit.core.components.device_component import DeviceComponent
 from tickit.core.typedefs import ComponentID
 from tickit.utils.byte_format import ByteFormat
 

diff --git a/examples/adapters/zeromq_push_adapter.py b/examples/adapters/zeromq_push_adapter.py
@@ -8,7 +8,7 @@
 from tickit.adapters.zmq import ZeroMqPushAdapter
 from tickit.core.adapter import AdapterContainer
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceComponent
+from tickit.core.components.device_component import DeviceComponent
 from tickit.devices.iobox import IoBoxDevice
 
 

diff --git a/examples/devices/amplifier.py b/examples/devices/amplifier.py
@@ -9,7 +9,7 @@
 from tickit.adapters.tcp import CommandAdapter
 from tickit.core.adapter import AdapterContainer
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceComponent
+from tickit.core.components.device_component import DeviceComponent
 from tickit.core.device import Device, DeviceUpdate
 from tickit.core.typedefs import SimTime
 from tickit.utils.byte_format import ByteFormat

diff --git a/examples/devices/counter.py b/examples/devices/counter.py
@@ -4,7 +4,7 @@
 import pydantic.v1.dataclasses
 
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceComponent
+from tickit.core.components.device_component import DeviceComponent
 from tickit.core.device import Device, DeviceUpdate
 from tickit.core.typedefs import SimTime
 

diff --git a/examples/devices/isolated_device.py b/examples/devices/isolated_device.py
@@ -9,7 +9,7 @@
 from tickit.adapters.tcp import CommandAdapter
 from tickit.core.adapter import AdapterContainer
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceComponent
+from tickit.core.components.device_component import DeviceComponent
 from tickit.core.device import Device, DeviceUpdate
 from tickit.core.typedefs import SimTime
 from tickit.utils.byte_format import ByteFormat

diff --git a/examples/devices/remote_controlled.py b/examples/devices/remote_controlled.py
@@ -10,7 +10,7 @@
 from tickit.adapters.tcp import CommandAdapter
 from tickit.core.adapter import AdapterContainer
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceComponent
+from tickit.core.components.device_component import DeviceComponent
 from tickit.core.device import Device, DeviceUpdate
 from tickit.core.typedefs import SimTime
 from tickit.utils.byte_format import ByteFormat

diff --git a/examples/devices/shutter.py b/examples/devices/shutter.py
@@ -8,7 +8,7 @@
 from tickit.adapters.tcp import CommandAdapter
 from tickit.core.adapter import AdapterContainer
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceComponent
+from tickit.core.components.device_component import DeviceComponent
 from tickit.core.device import Device, DeviceUpdate
 from tickit.core.typedefs import SimTime
 from tickit.utils.byte_format import ByteFormat

diff --git a/examples/devices/trampoline.py b/examples/devices/trampoline.py
@@ -5,7 +5,7 @@
 import pydantic.v1.dataclasses
 
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceComponent
+from tickit.core.components.device_component import DeviceComponent
 from tickit.core.device import Device, DeviceUpdate
 from tickit.core.typedefs import SimTime
 

diff --git a/...ckit/core/components/device_simulation.py → ...ickit/core/components/device_component.py b/...ckit/core/components/device_simulation.py → ...ickit/core/components/device_component.py
diff --git a/src/tickit/devices/iobox.py b/src/tickit/devices/iobox.py
@@ -5,7 +5,7 @@
 from typing_extensions import NotRequired
 
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceComponent
+from tickit.core.components.device_component import DeviceComponent
 from tickit.core.device import Device, DeviceUpdate
 from tickit.core.typedefs import SimTime
 

diff --git a/src/tickit/devices/sink.py b/src/tickit/devices/sink.py
@@ -4,7 +4,7 @@
 import pydantic.v1.dataclasses
 
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceComponent
+from tickit.core.components.device_component import DeviceComponent
 from tickit.core.device import Device, DeviceUpdate
 from tickit.core.typedefs import SimTime
 

diff --git a/src/tickit/devices/source.py b/src/tickit/devices/source.py
@@ -4,7 +4,7 @@
 import pydantic.v1.dataclasses
 
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceComponent
+from tickit.core.components.device_component import DeviceComponent
 from tickit.core.device import Device, DeviceUpdate
 from tickit.core.typedefs import SimTime
 

diff --git a/tests/core/components/test_device_simulation.py b/tests/core/components/test_device_simulation.py
@@ -7,7 +7,7 @@
 from tickit.adapters.io.tcp_io import TcpIo
 from tickit.adapters.tcp import CommandAdapter
 from tickit.core.adapter import AdapterContainer
-from tickit.core.components.device_simulation import DeviceComponent
+from tickit.core.components.device_component import DeviceComponent
 from tickit.core.state_interfaces.state_interface import StateConsumer, StateProducer
 from tickit.core.typedefs import (
     Changes,
@@ -60,7 +60,7 @@ def mock_state_consumer_type() -> Mock:
 @pytest.fixture
 def patch_asyncio_wait() -> Iterable[Mock]:
     with patch(
-        "tickit.core.components.device_simulation.asyncio.wait", autospec=True
+        "tickit.core.components.device_component.asyncio.wait", autospec=True
     ) as mock:
         yield mock
 

diff --git a/tests/core/test_simulation.py b/tests/core/test_simulation.py
@@ -131,7 +131,7 @@ async def test_running_only_scheduler(
 @pytest_asyncio.fixture
 async def patch_component_run_forever() -> AsyncGenerator:
     with patch(
-        "tickit.core.components.device_simulation.DeviceComponent.run_forever",
+        "tickit.core.components.device_component.DeviceComponent.run_forever",
         autospec=True,
     ) as mock:
         mock.return_value = asyncio.create_task(asyncio.sleep(1))

diff --git a/tests/system_tests/test_with_master.py b/tests/system_tests/test_with_master.py
@@ -9,7 +9,7 @@
 from mock import create_autospec
 
 from tickit.core.components.component import Component, ComponentConfig
-from tickit.core.components.device_simulation import DeviceComponent
+from tickit.core.components.device_component import DeviceComponent
 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

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