Merge pull request #84 from catalystneuro/rename_nwbconverters

renamed nwbconverters to avoid ambiguity
catalystneuro · Oct 13, 2023 · 5b2d79f · 5b2d79f
2 parents 239770f + 60467f1
commit 5b2d79f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/frozen_dependencies.txt b/frozen_dependencies.txt
@@ -115,7 +115,8 @@ natsort==8.4.0
 nbclient==0.8.0
 nbconvert==7.7.3
 nbformat==5.9.2
--e git+https://github.com/pauladkisson/ndx-moseq.git@2c25aaa85bb70762111a520918c73abac4ac0801#egg=ndx_depth_moseq
+# Editable install with no version control (ndx-depth-moseq==0.1.0)
+-e /opt/anaconda3/envs/datta_env/lib/python3.10/site-packages
 ndx-events==0.2.0
 ndx-grayscalevolume==0.0.2
 ndx-icephys-meta==0.1.0

diff --git a/src/datta_lab_to_nwb/markowitz_gillis_nature_2023/convert_session.py b/src/datta_lab_to_nwb/markowitz_gillis_nature_2023/convert_session.py
@@ -10,7 +10,7 @@
 
 # Local
 from datta_lab_to_nwb.markowitz_gillis_nature_2023.postconversion import reproduce_fig1d
-from datta_lab_to_nwb import markowitz_gillis_nature_2023
+from datta_lab_to_nwb.markowitz_gillis_nature_2023.nwbconverter import DattaNWBConverter
 
 
 def session_to_nwb(
@@ -114,7 +114,7 @@ def session_to_nwb(
     if experiment_type == "velocity-modulation":
         conversion_options["BehavioralSyllable"] = dict(velocity_modulation=True)
 
-    converter = markowitz_gillis_nature_2023.NWBConverter(source_data=source_data)
+    converter = DattaNWBConverter(source_data=source_data)
     metadata = converter.get_metadata()
 
     # Update metadata

diff --git a/src/datta_lab_to_nwb/markowitz_gillis_nature_2023/nwbconverter.py b/src/datta_lab_to_nwb/markowitz_gillis_nature_2023/nwbconverter.py
@@ -8,7 +8,7 @@
 from .irvideointerface import IRVideoInterface
 
 
-class NWBConverter(NWBConverter):
+class DattaNWBConverter(NWBConverter):
     """Primary conversion class."""
 
     data_interface_classes = dict(

diff --git a/src/datta_lab_to_nwb/markowitz_gillis_nature_2023_HEK/convert_session.py b/src/datta_lab_to_nwb/markowitz_gillis_nature_2023_HEK/convert_session.py
@@ -2,7 +2,7 @@
 from pathlib import Path
 from typing import Union
 from neuroconv.utils import dict_deep_update, load_dict_from_file
-from datta_lab_to_nwb import markowitz_gillis_nature_2023_HEK
+from datta_lab_to_nwb.markowitz_gillis_nature_2023_HEK.nwbconverter import DattaHEKNWBConverter
 import shutil
 from pynwb import NWBHDF5IO
 from datta_lab_to_nwb.markowitz_gillis_nature_2023_HEK.postconversion import reproduce_figS1abcd
@@ -28,7 +28,7 @@ def session_to_nwb(
     conversion_options = {
         "HEK": dict(),
     }
-    converter = markowitz_gillis_nature_2023_HEK.NWBConverter(source_data=source_data)
+    converter = DattaHEKNWBConverter(source_data=source_data)
     metadata = converter.get_metadata()
 
     # Update metadata

diff --git a/src/datta_lab_to_nwb/markowitz_gillis_nature_2023_HEK/nwbconverter.py b/src/datta_lab_to_nwb/markowitz_gillis_nature_2023_HEK/nwbconverter.py
@@ -3,7 +3,7 @@
 from .hekinterface import HEKInterface
 
 
-class NWBConverter(NWBConverter):
+class DattaHEKNWBConverter(NWBConverter):
     """Primary conversion class."""
 
     data_interface_classes = dict(