lint

mio/devices/wirefree.py

@@ -10,11 +10,11 @@
 import numpy as np
 from tqdm import tqdm
 
-from miniscope_io import init_logger
-from miniscope_io.devices import DeviceConfig, Miniscope, RecordingCameraMixin
-from miniscope_io.exceptions import EndOfRecordingException, ReadHeaderException
-from miniscope_io.models.data import Frame
-from miniscope_io.models.sdcard import SDBufferHeader, SDConfig, SDLayout
+from mio import init_logger
+from mio.devices import DeviceConfig, Miniscope, RecordingCameraMixin
+from mio.exceptions import EndOfRecordingException, ReadHeaderException
+from mio.models.data import Frame
+from mio.models.sdcard import SDBufferHeader, SDConfig, SDLayout
 
 
 class WireFreeConfig(DeviceConfig):

mio/models/pipeline.py

@@ -8,8 +8,8 @@
 
 from pydantic import Field
 
-from miniscope_io.exceptions import ConfigurationMismatchError
-from miniscope_io.models.models import MiniscopeConfig, PipelineModel
+from mio.exceptions import ConfigurationMismatchError
+from mio.models.models import MiniscopeConfig, PipelineModel
 
 if sys.version_info < (3, 11):
     from typing_extensions import Self

mio/sources/mocks.py

@@ -18,11 +18,7 @@
 
 class okDevMock:
     """
-<<<<<<<< HEAD:miniscope_io/sources/mocks.py
-    Mock class for :class:`~miniscope_io.sources.opalkelly.okDev`
-========
-    Mock class for :class:`~mio.devices.opalkelly.okDev`
->>>>>>>> main:mio/devices/mocks.py
+    Mock class for :class:`~mio.sources.opalkelly.okDev`
     """
 
     DATA_FILE: Optional[Path] = None

mio/types.py

@@ -6,7 +6,7 @@
 import sys
 from os import PathLike
 from pathlib import Path
-from typing import Annotated, Any, Tuple, Union, NamedTuple, Tuple, Union
+from typing import Annotated, Any, NamedTuple, Tuple, Union
 
 from pydantic import AfterValidator, Field