Merge pull request #123 from MouseLand/dev

Fix import bug and linter

docs/conf.py

@@ -15,6 +15,7 @@
 #
 import os
 import sys
+
 sys.path.insert(0, os.path.abspath('.'))
 
 """ 

facemap/gui/gui.py

@@ -2,9 +2,10 @@
 Copright © 2023 Howard Hughes Medical Institute, Authored by Carsen Stringer and Atika Syeda.
 """
 import os
-import sys, cv2
+import sys
 from pathlib import Path
 
+import cv2
 import h5py
 import matplotlib
 import matplotlib.pyplot as plt
@@ -37,7 +38,14 @@
 from scipy.stats import skew, zscore
 
 from facemap import process, roi, utils
-from facemap.gui import cluster, guiparts, help_windows, io, menus, neural_activity_window
+from facemap.gui import (
+    cluster,
+    guiparts,
+    help_windows,
+    io,
+    menus,
+    neural_activity_window,
+)
 from facemap.pose import model_loader, pose, pose_gui, refine_pose
 
 istr = ["pupil", "motSVD", "blink", "running", "movSVD"]

facemap/gui/neural_activity_window.py

@@ -1,16 +1,16 @@
-import numpy as np
-from PyQt5 import QtCore, QtWidgets, QtGui
 import os
+
+import matplotlib
+import numpy as np
+import pyqtgraph as pg
 import scipy.io as sio
-from facemap.gui import guiparts, help_windows, io
-from facemap.neural_prediction import prediction_utils
-from PyQt5.QtWidgets import *
+from matplotlib import cm
+from PyQt5 import QtCore, QtGui, QtWidgets
 from PyQt5.QtCore import Qt, QUrl
+from PyQt5.QtWidgets import *
+
 from facemap import utils
-import matplotlib
-from matplotlib import cm
-import pyqtgraph as pg
-from PyQt5.QtMultimedia import QMediaPlayer, QMediaContent
+from facemap.gui import guiparts, help_windows, io
 from facemap.neural_prediction import neural_activity, prediction_utils
 
 

facemap/pose/refine_pose.py

@@ -32,11 +32,11 @@
     QSpinBox,
     QVBoxLayout,
 )
+from torch.nn import functional as F
 
 from .. import utils
 from ..gui import help_windows, io
 from . import model_loader, transforms
-from torch.nn import functional as F
 
 """
 Single workflow for re-training the model or fine-tuning the model with new data.