Merge branch 'bec_utils_update' into 'master'

fix: moved to new bec_client_lib structure

See merge request bec/ophyd_devices!25
This commit is contained in:
wakonig_k 2023-06-02 08:37:23 +00:00
commit 422f963b4c
8 changed files with 9 additions and 10 deletions

View File

@ -20,5 +20,5 @@ pytest:
stage: Test
script:
- git clone https://oauth2:$CI_BEC_KEY@gitlab.psi.ch/bec/bec.git
- pip install -e ./bec/bec_utils
- pip install -e ./bec/bec_client_lib
- pytest -v ./tests

View File

@ -2,9 +2,9 @@ import os
import time
from typing import List
from bec_utils import BECMessage, MessageEndpoints, bec_logger
from bec_client_lib.core import BECMessage, MessageEndpoints, bec_logger
from ophyd import Component as Cpt
from ophyd import Device, DeviceStatus, EpicsSignal, Signal, EpicsSignalRO
from ophyd import Device, DeviceStatus, EpicsSignal, EpicsSignalRO, Signal
logger = bec_logger.logger

View File

@ -6,7 +6,7 @@ import traceback
from collections import OrderedDict
from typing import Any
from bec_utils import bec_logger
from bec_client_lib.core import bec_logger
from ophyd import Component as Cpt
from ophyd import Device, EpicsMotor, EpicsSignal, EpicsSignalRO
from ophyd import FormattedComponent as FCpt

View File

@ -4,7 +4,7 @@ import time
from typing import List
import numpy as np
from bec_utils import bec_logger
from bec_client_lib.core import bec_logger
from ophyd import Component as Cpt
from ophyd import Device, PositionerBase, Signal
from ophyd.status import wait as status_wait

View File

@ -4,12 +4,11 @@ import time
from typing import List
import numpy as np
from bec_utils import BECMessage, MessageEndpoints, bec_logger
from bec_client_lib.core import BECMessage, MessageEndpoints, bec_logger
from ophyd import Component as Cpt
from ophyd import Device, PositionerBase, Signal
from ophyd.status import wait as status_wait
from ophyd.utils import LimitError, ReadOnlyError
from ophyd_devices.utils.controller import Controller, threadlocked
from ophyd_devices.utils.socket import SocketIO, SocketSignal, raise_if_disconnected

View File

@ -5,7 +5,7 @@ import warnings
from typing import List
import numpy as np
from bec_utils import BECMessage, MessageEndpoints, bec_logger
from bec_client_lib.core import BECMessage, MessageEndpoints, bec_logger
from ophyd import Component as Cpt
from ophyd import Device, DeviceStatus, OphydObject, PositionerBase, Signal
from ophyd.sim import _ReadbackSignal, _SetpointSignal

View File

@ -4,7 +4,7 @@ import time
from typing import List
import numpy as np
from bec_utils import bec_logger
from bec_client_lib.core import bec_logger
from ophyd import Component as Cpt
from ophyd import Device, PositionerBase, Signal
from ophyd.status import wait as status_wait

View File

@ -6,7 +6,7 @@ import time
import typing
import numpy as np
from bec_utils import bec_logger
from bec_client_lib.core import bec_logger
from ophyd import Signal
from ophyd.utils.errors import DisconnectedError