resolve merge conflicts
This commit is contained in:
commit
5a641d0e2e
2 files changed
+2
-13
No files matched your search
+1
-1
@@ -19,7 +19,7 @@ dependencies = [
|
||||
"h5py",
|
||||
"ophyd_devices",
|
||||
"opencv-python==4.11.0.86",
|
||||
"xrt",
|
||||
"xrt~=1.6.2",
|
||||
"xraydb",
|
||||
]
|
||||
|
||||
|
||||
@@ -2,29 +2,18 @@
|
||||
import os
|
||||
import threading
|
||||
import time
|
||||
from dataclasses import fields
|
||||
from unittest import mock
|
||||
|
||||
import ophyd
|
||||
import pytest
|
||||
from bec_lib.messages import ScanQueueMessage, ScanStatusMessage
|
||||
from bec_server.device_server.tests.utils import DMMock
|
||||
from bec_server.scan_server.scan_assembler import ScanAssembler
|
||||
from bec_server.scan_server.scan_queue import RequestBlock
|
||||
from bec_server.scan_server.scan_worker import ScanWorker
|
||||
from bec_server.scan_server.tests.fixtures import scan_server_mock
|
||||
from ophyd.utils import LimitError
|
||||
from ophyd_devices.tests.utils import MockPV
|
||||
|
||||
from debye_bec.devices.mo1_bragg.acs import ACSController
|
||||
from debye_bec.devices.mo1_bragg.mo1_bragg import (
|
||||
Mo1Bragg,
|
||||
Mo1BraggError,
|
||||
ScanControlLoadMessage,
|
||||
ScanControlMode,
|
||||
ScanControlScanStatus,
|
||||
)
|
||||
from debye_bec.devices.mo1_bragg.mo1_bragg_devices import MoveType
|
||||
from debye_bec.devices.mo1_bragg.mo1_bragg import Mo1Bragg, ScanControlMode, ScanControlScanStatus
|
||||
|
||||
# TODO move this function to ophyd_devices, it is duplicated in csaxs_bec and needed for other pluging repositories
|
||||
from debye_bec.devices.test_utils.utils import patch_dual_pvs
|
||||
|
||||
Reference in new issue
Block a user