From 8886dc5fd3bd5177e0a5b7723b70e3eb6ba3339f Mon Sep 17 00:00:00 2001 From: Oliver Copping Date: Tue, 16 Apr 2024 10:37:17 +0100 Subject: [PATCH] Sorted imports --- src/ophyd_async/core/detector.py | 3 ++- src/ophyd_async/core/signal.py | 1 + src/ophyd_async/core/standard_readable.py | 1 + src/ophyd_async/protocols/__init__.py | 2 +- src/ophyd_async/protocols/protocols.py | 3 ++- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ophyd_async/core/detector.py b/src/ophyd_async/core/detector.py index 9badaa16ad..b2b2ec890f 100644 --- a/src/ophyd_async/core/detector.py +++ b/src/ophyd_async/core/detector.py @@ -28,7 +28,8 @@ Triggerable, WritesStreamAssets, ) -from ophyd_async.protocols import AsyncReadable, AsyncConfigurable + +from ophyd_async.protocols import AsyncConfigurable, AsyncReadable from .async_status import AsyncStatus from .device import Device diff --git a/src/ophyd_async/core/signal.py b/src/ophyd_async/core/signal.py index 532983ef33..4bebdd3a11 100644 --- a/src/ophyd_async/core/signal.py +++ b/src/ophyd_async/core/signal.py @@ -13,6 +13,7 @@ Stageable, Subscribable, ) + from ophyd_async.protocols import AsyncReadable from .async_status import AsyncStatus diff --git a/src/ophyd_async/core/standard_readable.py b/src/ophyd_async/core/standard_readable.py index fd77445557..3c37d5a332 100644 --- a/src/ophyd_async/core/standard_readable.py +++ b/src/ophyd_async/core/standard_readable.py @@ -1,6 +1,7 @@ from typing import Dict, Sequence, Tuple from bluesky.protocols import Descriptor, Reading, Stageable + from ophyd_async.protocols import AsyncConfigurable, AsyncReadable from .async_status import AsyncStatus diff --git a/src/ophyd_async/protocols/__init__.py b/src/ophyd_async/protocols/__init__.py index f09cb514a3..63fdf7025e 100644 --- a/src/ophyd_async/protocols/__init__.py +++ b/src/ophyd_async/protocols/__init__.py @@ -1,3 +1,3 @@ -from .protocols import AsyncReadable, AsyncConfigurable, AsyncPausable +from .protocols import AsyncConfigurable, AsyncPausable, AsyncReadable __all__ = ["AsyncReadable", "AsyncConfigurable", "AsyncPausable"] diff --git a/src/ophyd_async/protocols/protocols.py b/src/ophyd_async/protocols/protocols.py index 5a6369877e..51169d5418 100644 --- a/src/ophyd_async/protocols/protocols.py +++ b/src/ophyd_async/protocols/protocols.py @@ -1,6 +1,7 @@ from abc import abstractmethod from typing import Dict, Protocol, runtime_checkable -from bluesky.protocols import HasName, Reading, Descriptor + +from bluesky.protocols import Descriptor, HasName, Reading @runtime_checkable