Merge branch 'master' of https://github.com/kushalkolar/MESmerize

docs/source/user_guides/viewer/overview.rst

@@ -180,11 +180,6 @@ If you double click on “meta” above you can see your meta data.
 
 You can view your meta data more quickly using the console.
 
-Open the console by going to View -> Console.
-You can then call ``get_meta()`` to print the meta data dict.
-
-.. image:: ./overview/11.png
-
 Console
 ^^^^^^^
 
@@ -203,6 +198,11 @@ Open these docs
 Console
 =======
 
+Open the console by going to View -> Console.
+You can then call ``get_meta()`` to print the meta data dict.
+
+.. image:: ./overview/11.png
+
 You can interact directly with the :ref:`work environment <ViewerWorkEnv>` using the console.
 
 .. seealso:: :ref:`Viewer Core API <API_ViewerCore>`, :ref:`Overview on consoles <ConsoleOverview>`

mesmerize/project_manager/project_browser/project_browser_window.py

@@ -15,7 +15,7 @@
 from .main_widget import ProjectBrowserWidget
 from ...pyqtgraphCore.console import ConsoleWidget
 from .pytemplates.mainwindow_pytemplate import Ui_MainWindow
-from spyder.widgets.variableexplorer import objecteditor
+#from spyder.widgets.variableexplorer import objecteditor
 import pandas as pd
 import os
 from ...common import configuration, get_project_manager

mesmerize/pyqtgraphCore/ptime.py

@@ -13,18 +13,17 @@
 
 def winTime():
     """Return the current time in seconds with high precision (windows version, use Manager.time() to stay platform independent)."""
-    return systime.clock() + START_TIME
+    return systime.process_time() + START_TIME
     #return systime.time()
 
 def unixTime():
     """Return the current time in seconds with high precision (unix version, use Manager.time() to stay platform independent)."""
     return systime.time()
 
 if sys.platform.startswith('win'):
-    cstart = systime.clock()  ### Required to start the clock in windows
+    cstart = systime.process_time()  ### Required to start the clock in windows
     START_TIME = systime.time() - cstart
-    
+
     time = winTime
 else:
     time = unixTime
-

mesmerize/viewer/main_window.py

@@ -24,7 +24,7 @@
 from ..common import configuration, doc_pages
 from ..common import get_window_manager
 from .image_menu.main import ImageMenu
-from spyder.widgets.variableexplorer import objecteditor
+#from spyder.widgets.variableexplorer import objecteditor
 import traceback
 from .core.add_to_project import AddToProjectDialog
 import os

setup.py

@@ -24,7 +24,7 @@
         "python-dateutil>=2.8.0",
         "QtPy>=1.6.0",
         "qtap",
-        "scikit-image~=0.15.0",  # do not change
+        "scikit-image",
         "scikit-learn~=0.23.1",  # tslearn 0.4 has issues with newer sklearn
         "scipy>=1.2.1",  # do not change
         "seaborn==0.9.0",  # do not change
@@ -40,7 +40,7 @@
         #"bottleneck==1.2.1",  # do not change
         "holoviews",
         "jupyter",
-        "pynwb",  # caiman requirement
+        #"pynwb",  # caiman requirement
         "pyqtgraph",
         #"tensorflow~=1.15.0",  # do not change, caiman requirement
         "tk",  # do not change
@@ -88,6 +88,6 @@
     long_description=long_description,
     long_description_content_type='text/markdown',
     classifiers=classifiers,
-    python_requires='>=3.6',
+    python_requires='>=3.8',
     install_requires=install_requires
 )