diff --git a/doc/walkthroughs/walkthrough.py b/doc/walkthroughs/walkthrough.py
index 44215f15d4307946ba03f1b5c31687a04dd4acf2..914a27835e98be04e0d9b1a942ed689ec33fa2e4 100755
--- a/doc/walkthroughs/walkthrough.py
+++ b/doc/walkthroughs/walkthrough.py
@@ -26,8 +26,7 @@ import matplotlib.pyplot as plt
import numpy as np
import scipy as sc
-from python_spectrometer import daq, Spectrometer
-
+from python_spectrometer import Spectrometer, daq
# %% [markdown]
# Matplotlib backend, choose `qt` for a separate window.
diff --git a/src/python_spectrometer/_audio_manager.py b/src/python_spectrometer/_audio_manager.py
index 144c92cc9f6562b9153556b0ebce89ee37df93a9..8d34ef328e95acfe05330a8b4767b058f2ed5dfa 100644
--- a/src/python_spectrometer/_audio_manager.py
+++ b/src/python_spectrometer/_audio_manager.py
@@ -3,7 +3,7 @@ import os
import queue
import threading
import time
-from typing import Union, Literal
+from typing import Literal, Union
import numpy as np
from scipy import signal
diff --git a/src/python_spectrometer/_plot_manager.py b/src/python_spectrometer/_plot_manager.py
index f5741365e7a131f9dc07ddc386c8f51c8682bfdf..2547bd6ab13abe99f02a86fa270a83c655ca9148 100644
--- a/src/python_spectrometer/_plot_manager.py
+++ b/src/python_spectrometer/_plot_manager.py
@@ -4,9 +4,9 @@ import os
import sys
import warnings
import weakref
-from typing import (Dict, Any, Optional, Tuple, ContextManager, Union, List,
- Literal, TypeVar, Callable)
-from collections.abc import Mapping, Iterable
+from collections.abc import Iterable, Mapping
+from typing import (Any, Callable, ContextManager, Dict, List, Literal, Optional, Tuple, TypeVar,
+ Union)
import matplotlib.pyplot as plt
import numpy as np
diff --git a/src/python_spectrometer/core.py b/src/python_spectrometer/core.py
index 29033b7b7fc8bb84b4de7f57994009a43fb387b3..cdb93aad2d0c7cdf10c2dcce16e9e7751a3315ce 100644
--- a/src/python_spectrometer/core.py
+++ b/src/python_spectrometer/core.py
@@ -5,13 +5,13 @@ import platform
import shelve
import sys
import warnings
+from collections.abc import Generator, Iterator, Mapping, Sequence
from datetime import datetime
from pathlib import Path
from pprint import pprint
-from queue import Queue, Empty, LifoQueue
-from threading import Thread, Event
-from typing import (Any, Callable, Dict, List, Literal, Optional, Tuple, Union, cast)
-from collections.abc import Generator, Iterator, Mapping, Sequence
+from queue import Empty, LifoQueue, Queue
+from threading import Event, Thread
+from typing import Any, Callable, Dict, List, Literal, Optional, Tuple, Union, cast
from unittest import mock
import dill
@@ -24,8 +24,7 @@ from qutil import io, misc
from qutil.functools import cached_property, chain, partial
from qutil.io import AsyncDatasaver
from qutil.itertools import count
-from qutil.plotting import is_using_mpl_gui_backend
-from qutil.plotting import live_view
+from qutil.plotting import is_using_mpl_gui_backend, live_view
from qutil.signal_processing.real_space import Id, welch
from qutil.typecheck import check_literals
from qutil.ui import progressbar
diff --git a/src/python_spectrometer/daq/__init__.pyi b/src/python_spectrometer/daq/__init__.pyi
index 83c91696a8ddb3effe78cc899bb549e0ec6aad4a..c408c10c0369d5a32992f704387236dab18a0b22 100644
--- a/src/python_spectrometer/daq/__init__.pyi
+++ b/src/python_spectrometer/daq/__init__.pyi
@@ -5,16 +5,11 @@ __all__ = ['atsaverage', 'atssimple', 'qcodes', 'simulator', 'swabian_instrument
from . import atsaverage, atssimple, qcodes, simulator, swabian_instruments, zurich_instruments
from .atsaverage import AlazarATS9xx0
-from .qcodes import (Keysight344xxA, NationalInstrumentsUSB6003,
- # Backwards "compatibility"
+from .qcodes import (Keysight344xxA, NationalInstrumentsUSB6003, # Backwards "compatibility"
keysight_344xxA, national_instruments_daq)
from .settings import DAQSettings
-from .simulator import (QoptColoredNoise,
- # Backwards "compatibility"
- qopt_colored_noise)
-from .swabian_instruments import (SwabianInstrumentsTimeTagger,
- # Backwards "compatibility"
+from .simulator import QoptColoredNoise, qopt_colored_noise # Backwards "compatibility"
+from .swabian_instruments import (SwabianInstrumentsTimeTagger, # Backwards "compatibility"
timetagger)
-from .zurich_instruments import (ZurichInstrumentsMFLIDAQ, ZurichInstrumentsMFLIScope,
- # Backwards "compatibility"
- MFLI_daq, MFLI_scope)
+from .zurich_instruments import (MFLI_daq, MFLI_scope, # Backwards "compatibility"
+ ZurichInstrumentsMFLIDAQ, ZurichInstrumentsMFLIScope)
diff --git a/src/python_spectrometer/daq/atsaverage.py b/src/python_spectrometer/daq/atsaverage.py
index 4591168367cf532491b0ce7337829002ed5bbc18..8bcf9c04699959c431b898fd4e672bade6e422f6 100644
--- a/src/python_spectrometer/daq/atsaverage.py
+++ b/src/python_spectrometer/daq/atsaverage.py
@@ -20,7 +20,7 @@ from __future__ import annotations
import dataclasses
import string
import time
-from typing import Callable, Type, Literal
+from typing import Callable, Literal, Type
from qutil.domains import ReciprocalDiscreteInterval
from qutil.functools import cached_property
@@ -34,13 +34,13 @@ except ImportError:
from numpy import array as NDArray
try:
+ from atsaverage.alazar import InputRangeID
+ from atsaverage.config2 import (BoardConfiguration, CaptureClockConfiguration,
+ CaptureClockType, Channel, EngineTriggerConfiguration,
+ InputConfiguration, SampleRateID, create_scanline_definition)
from atsaverage.core import AlazarCard
from atsaverage.masks import PeriodicMask
from atsaverage.operations import Downsample
- from atsaverage.alazar import InputRangeID
- from atsaverage.config2 import (BoardConfiguration, EngineTriggerConfiguration,
- CaptureClockConfiguration, CaptureClockType, SampleRateID,
- InputConfiguration, Channel, create_scanline_definition)
except ImportError as e:
raise RuntimeError('This DAQ requires the atsaverage library. Clone it from '
'https://git.rwth-aachen.de/qutech/cpp-atsaverage/') from e
diff --git a/src/python_spectrometer/daq/atssimple.py b/src/python_spectrometer/daq/atssimple.py
index 3d96ccd1b1169565080f0886b7a5f39b4289f728..f095a47b3293ddca5abb4984001603cec7475461 100644
--- a/src/python_spectrometer/daq/atssimple.py
+++ b/src/python_spectrometer/daq/atssimple.py
@@ -38,7 +38,7 @@ from __future__ import annotations
import dataclasses
import time
-from typing import Type, Literal, Callable
+from typing import Callable, Literal, Type
import numpy as np
from qutil.domains import ReciprocalDiscreteInterval
@@ -53,7 +53,7 @@ except ImportError:
from numpy import array as NDArray
try:
- from atssimple import atsapi, acquire_downsample_windows, ATSSimpleCard
+ from atssimple import ATSSimpleCard, acquire_downsample_windows, atsapi
except ImportError as e:
raise RuntimeError('This DAQ requires the atssimple library. Clone it from '
'https://git-ce.rwth-aachen.de/qutech/lab_software/atssimple/') from e
diff --git a/src/python_spectrometer/daq/base.py b/src/python_spectrometer/daq/base.py
index 9d38a4230308311583b33b8b95162fe220884bd3..1687d8b6958c2e386aeb134d2a929c667cead12c 100644
--- a/src/python_spectrometer/daq/base.py
+++ b/src/python_spectrometer/daq/base.py
@@ -5,7 +5,7 @@ import sys
import warnings
from abc import ABC
from collections.abc import Generator
-from typing import Any, Dict, Type, Optional
+from typing import Any, Dict, Optional, Type
import numpy as np
from qutil.functools import cached_property
diff --git a/src/python_spectrometer/daq/qcodes.py b/src/python_spectrometer/daq/qcodes.py
index 238fa70581e98eb8b5c1ff3bbc4bd3576705bbee..f248f8abba79c3f4f0a70c2a3e3d55b165805bc1 100644
--- a/src/python_spectrometer/daq/qcodes.py
+++ b/src/python_spectrometer/daq/qcodes.py
@@ -4,9 +4,9 @@ import dataclasses
import logging
import sys
import warnings
+from collections.abc import Sequence
from types import ModuleType
from typing import Any, Dict, Type
-from collections.abc import Sequence
from unittest.mock import Mock
import numpy as np
@@ -35,9 +35,8 @@ else:
from qcodes.instrument_drivers.Keysight import Keysight344xxA as _Keysight344xxA_qcodes
except ImportError:
# Maybe qcodes < 0.46 and name not available in top-level Keysight module
- from qcodes.instrument_drivers.Keysight.private.Keysight_344xxA_submodules import (
+ from qcodes.instrument_drivers.Keysight.private.Keysight_344xxA_submodules import \
_Keysight_344xxA as _Keysight344xxA_qcodes
- )
try:
from qcodes_contrib_drivers.drivers.Andor import AndorIDus4xx as _AndorIDus4xx_qcodes
except ImportError:
diff --git a/src/python_spectrometer/daq/swabian_instruments.py b/src/python_spectrometer/daq/swabian_instruments.py
index 1d1050a1c1c074807d9a1db23f5ce399b3dd77c6..8bfc328bd2ebb8f087baa32cf3be600df932ee89 100644
--- a/src/python_spectrometer/daq/swabian_instruments.py
+++ b/src/python_spectrometer/daq/swabian_instruments.py
@@ -4,8 +4,8 @@ from __future__ import annotations
import dataclasses
import sys
import warnings
-from typing import Any, Dict
from collections.abc import Iterable, Sequence
+from typing import Any, Dict
from .base import DAQ, AcquisitionGenerator
diff --git a/src/python_spectrometer/daq/zurich_instruments.py b/src/python_spectrometer/daq/zurich_instruments.py
index c351b17157ce1748e6443c32be1ee0c05f8f7228..90bf079c0570d710453da73b5e1a37e4a11c913d 100644
--- a/src/python_spectrometer/daq/zurich_instruments.py
+++ b/src/python_spectrometer/daq/zurich_instruments.py
@@ -58,8 +58,8 @@ import sys
import time
import warnings
from abc import ABC
-from typing import Any, Dict, Optional, Type
from collections.abc import Mapping
+from typing import Any, Dict, Optional, Type
import numpy as np
from packaging import version
diff --git a/tests/test_live_view.py b/tests/test_live_view.py
index e5245e5efe443b36a3af3a1970b5d23c5e9dd612..bfcca0e857ba5edd474c4f6858cff2ad1c0cf0a0 100644
--- a/tests/test_live_view.py
+++ b/tests/test_live_view.py
@@ -11,7 +11,7 @@ from qutil.plotting import is_using_mpl_gui_backend
from qutil.plotting.live_view import LiveViewBase, LiveViewT
from python_spectrometer import Spectrometer, daq
-from python_spectrometer.core import TimeLiveView, FrequencyLiveView
+from python_spectrometer.core import FrequencyLiveView, TimeLiveView
def start_animation(fig):
diff --git a/tests/test_serialization.py b/tests/test_serialization.py
index ae664a3fb8878a43e844286868c0071188c6c1e1..38d08a37ec12b13d8cc469c85ba5091f2a924f7a 100644
--- a/tests/test_serialization.py
+++ b/tests/test_serialization.py
@@ -6,9 +6,10 @@ import time
from tempfile import mkdtemp
import pytest
-from python_spectrometer import Spectrometer, daq
from qutil.plotting import is_using_mpl_gui_backend
+from python_spectrometer import Spectrometer, daq
+
def remove_file_if_exists(file):
try: