diff --git a/socs/actions.py b/socs/actions.py index 33ef39b87..d6ce1a85c 100644 --- a/socs/actions.py +++ b/socs/actions.py @@ -5,7 +5,6 @@ from ocs import ocs_agent - ActionResultType = Optional[Dict[str, Any]] OcsOpReturnType = Tuple[bool, str] diff --git a/socs/agents/lakeshore240/agent.py b/socs/agents/lakeshore240/agent.py index cf4de6177..a3aa60d70 100644 --- a/socs/agents/lakeshore240/agent.py +++ b/socs/agents/lakeshore240/agent.py @@ -11,8 +11,8 @@ from ocs import ocs_agent, site_config from ocs.ocs_twisted import Pacemaker -from socs.Lakeshore.Lakeshore240 import Module from socs.actions import BaseAction, OcsOpReturnType, register_task_from_action +from socs.Lakeshore.Lakeshore240 import Module txaio.use_twisted()