From e0d61ca28fb40f9694d36bf780af4081a1ad088d Mon Sep 17 00:00:00 2001
From: sneakers-the-rat <sneakers-the-rat@protonmail.com>
Date: Thu, 12 Dec 2024 20:28:45 -0800
Subject: [PATCH] lint

---
 mio/devices/wirefree.py | 10 +++++-----
 mio/models/pipeline.py  |  4 ++--
 mio/sources/mocks.py    |  6 +-----
 mio/types.py            |  2 +-
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/mio/devices/wirefree.py b/mio/devices/wirefree.py
index d072bc5f..0b867c5f 100644
--- a/mio/devices/wirefree.py
+++ b/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):
diff --git a/mio/models/pipeline.py b/mio/models/pipeline.py
index 292c69f1..0152a1bf 100644
--- a/mio/models/pipeline.py
+++ b/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
diff --git a/mio/sources/mocks.py b/mio/sources/mocks.py
index 52945bba..d507f789 100644
--- a/mio/sources/mocks.py
+++ b/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
diff --git a/mio/types.py b/mio/types.py
index c78350da..9ec47b59 100644
--- a/mio/types.py
+++ b/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