From 35d5ec8e9d94c0a845b852b6cd8182897464fca8 Mon Sep 17 00:00:00 2001 From: Klaus Wakonig Date: Thu, 1 Jun 2023 19:30:06 +0200 Subject: [PATCH 1/2] fix: moved to new bec_client_lib structure --- ophyd_devices/eiger1p5m_csaxs/eiger1p5m.py | 4 ++-- ophyd_devices/epics/devices/X07MADevices.py | 2 +- ophyd_devices/galil/galil_ophyd.py | 2 +- ophyd_devices/rt_lamni/rt_lamni_ophyd.py | 3 +-- ophyd_devices/sim/sim.py | 2 +- ophyd_devices/smaract/smaract_ophyd.py | 2 +- ophyd_devices/utils/socket.py | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ophyd_devices/eiger1p5m_csaxs/eiger1p5m.py b/ophyd_devices/eiger1p5m_csaxs/eiger1p5m.py index f677d8b..b46d62b 100644 --- a/ophyd_devices/eiger1p5m_csaxs/eiger1p5m.py +++ b/ophyd_devices/eiger1p5m_csaxs/eiger1p5m.py @@ -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 diff --git a/ophyd_devices/epics/devices/X07MADevices.py b/ophyd_devices/epics/devices/X07MADevices.py index 49bf202..65a2a5e 100644 --- a/ophyd_devices/epics/devices/X07MADevices.py +++ b/ophyd_devices/epics/devices/X07MADevices.py @@ -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 diff --git a/ophyd_devices/galil/galil_ophyd.py b/ophyd_devices/galil/galil_ophyd.py index 7c89d15..2074203 100644 --- a/ophyd_devices/galil/galil_ophyd.py +++ b/ophyd_devices/galil/galil_ophyd.py @@ -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 diff --git a/ophyd_devices/rt_lamni/rt_lamni_ophyd.py b/ophyd_devices/rt_lamni/rt_lamni_ophyd.py index 074a67a..91bd265 100644 --- a/ophyd_devices/rt_lamni/rt_lamni_ophyd.py +++ b/ophyd_devices/rt_lamni/rt_lamni_ophyd.py @@ -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 diff --git a/ophyd_devices/sim/sim.py b/ophyd_devices/sim/sim.py index 2d85a1a..da750d5 100644 --- a/ophyd_devices/sim/sim.py +++ b/ophyd_devices/sim/sim.py @@ -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 diff --git a/ophyd_devices/smaract/smaract_ophyd.py b/ophyd_devices/smaract/smaract_ophyd.py index 84591ef..72d6b8e 100644 --- a/ophyd_devices/smaract/smaract_ophyd.py +++ b/ophyd_devices/smaract/smaract_ophyd.py @@ -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 diff --git a/ophyd_devices/utils/socket.py b/ophyd_devices/utils/socket.py index 858f5c5..07a6ce2 100644 --- a/ophyd_devices/utils/socket.py +++ b/ophyd_devices/utils/socket.py @@ -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 From f86024e22f72c4963f57c40b4b34fe6553dcf34e Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 2 Jun 2023 08:34:13 +0000 Subject: [PATCH 2/2] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 53800f3..4ec6ea0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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