Linting: black, flake8, and isort.

src/firefly/queue_client.py

@@ -1,6 +1,4 @@
 import logging
-import time
-import warnings
 from typing import Mapping, Optional
 
 from bluesky_queueserver_api import comm_base
@@ -58,11 +56,13 @@ def queue_status(status_mapping: Mapping[str, str] = {}):
             to_update["status_changed"] = (status,)
         # Check individual status items to see if they've changed
         status_diff = {
-            key: val for key, val in status.items()
+            key: val
+            for key, val in status.items()
             if key not in last_status or val != last_status[key]
         }
         updated_params = {
-            status_mapping[key]: (val,) for key, val in status_diff.items()
+            status_mapping[key]: (val,)
+            for key, val in status_diff.items()
             if key in status_mapping
         }
         to_update.update(updated_params)
@@ -97,7 +97,6 @@ class QueueClient(QObject):
         "devices_allowed_uid": "devices_allowed_changed",
     }
 
-
     # Signals responding to queue changes
     status_changed = Signal(dict)
     length_changed = Signal(int)
@@ -122,7 +121,7 @@ def __init__(self, *args, api, **kwargs):
         next(self.status)  # Prime the generator
 
     def start(self):
-        # Start the time so that it 
+        # Start the time so that it
         self.timer.start(int(self.timeout * 1000))
 
     @asyncSlot(bool)
@@ -170,7 +169,7 @@ async def toggle_autostart(self, enable: bool):
             self.check_result(result, task="toggle auto-start")
         finally:
             await self.update()
-            
+
     @asyncSlot(bool)
     async def stop_queue(self, stop: bool):
         """Turn on/off whether the queue will stop after the current plan."""
@@ -255,9 +254,9 @@ async def queue_status(self) -> dict:
           The response from the queueserver regarding its status. If
           the queueserver is not reachable, then
           ``status['manager_state']`` will be ``"disconnected"``.
-        
+
         """
-        
+
         try:
             status = await self.api.status()
         except comm_base.RequestTimeoutError as e:

src/firefly/tests/test_queue_client.py

@@ -1,16 +1,14 @@
 import datetime as dt
 import time
-from unittest.mock import AsyncMock
 from collections import ChainMap
+from unittest.mock import AsyncMock
 
 import pytest
-from pytestqt.exceptions import TimeoutError
 from qtpy.QtCore import QTimer
 from qtpy.QtWidgets import QAction
 
 from firefly import queue_client
 
-
 qs_status = {
     "msg": "RE Manager v0.0.18",
     "items_in_queue": 0,

src/queueserver/queueserver_startup.py

@@ -1,12 +1,11 @@
 import logging
 import re  # noqa: F401
-from functools import partial, wraps
 
 import bluesky.preprocessors as bpp  # noqa: F401
 import databroker  # noqa: F401
-from bluesky.plan_stubs import abs_set
+from bluesky.plan_stubs import abs_set  # noqa: F401
 from bluesky.plan_stubs import mv as _mv  # noqa: F401
-from bluesky.plan_stubs import mvr, null, pause, rel_set, sleep, stop
+from bluesky.plan_stubs import mvr, null, pause, rel_set, sleep, stop  # noqa: F401
 from bluesky.plans import (  # noqa: F401
     count,
     grid_scan,
@@ -54,18 +53,13 @@
     globals().setdefault(name, cpt)
 
 
-from collections.abc import Hashable
-
 # Workaround for https://github.com/bluesky/bluesky-queueserver/issues/310
-from typing import Any, Optional, Union
-
-from bluesky.protocols import Movable, NamedMovable, Status
-from bluesky.utils import MsgGenerator
+from collections.abc import Hashable
 
 
 def mv(
     *args,
-    group: Optional[Hashable] = None,
+    group: Hashable | None = None,
     **kwargs,
 ):
     """