Merge pull request #37 from NovelaNeuro/user/wmerynda/new_ndx

NovelaNeuro · May 27, 2020 · e54af06 · e54af06
2 parents 79ee140 + 03eaca6
commit e54af06
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@
     ],
     'packages': find_packages('src/pynwb'),
     'package_dir': {'': 'src/pynwb'},
-    'package_data': {'ndx_fl_novela': [
+    'package_data': {'ndx_franklab_novela': [
         'spec/ndx-franklab-novela.namespace.yaml',
         'spec/ndx-franklab-novela.extensions.yaml',
     ]},
@@ -53,7 +53,7 @@
 def _copy_spec_files(project_dir):
     ns_path = os.path.join(project_dir, 'spec', 'ndx-franklab-novela.namespace.yaml')
     ext_path = os.path.join(project_dir, 'spec', 'ndx-franklab-novela.extensions.yaml')
-    dst_dir = os.path.join(project_dir, 'src', 'pynwb', 'ndx_fl_novela', 'spec')
+    dst_dir = os.path.join(project_dir, 'src', 'pynwb', 'ndx_franklab_novela', 'spec')
 
     if not os.path.exists(dst_dir):
         os.mkdir(dst_dir)

diff --git a/src/pynwb/ndx_fl_novela/__init__.py → src/pynwb/ndx_franklab_novela/__init__.py b/src/pynwb/ndx_fl_novela/__init__.py → src/pynwb/ndx_franklab_novela/__init__.py
@@ -3,21 +3,21 @@
 from pynwb import load_namespaces
 
 # Set path of the namespace.yaml file to the expected install location
-ndx_fl_novela_specpath = os.path.join(
+ndx_franklab_novela_specpath = os.path.join(
     os.path.dirname(__file__),
     'spec',
     'ndx-franklab-novela.namespace.yaml'
 )
 
 # If the extension has not been installed yet but we are running directly from
 # the git repo
-if not os.path.exists(ndx_fl_novela_specpath):
-    ndx_fl_novela_specpath = os.path.abspath(os.path.join(
+if not os.path.exists(ndx_franklab_novela_specpath):
+    ndx_franklab_novela_specpath = os.path.abspath(os.path.join(
         os.path.dirname(__file__),
         '..', '..', '..',
         'spec',
         'ndx-franklab-novela.namespace.yaml'
     ))
 
 # Load the namespace
-load_namespaces(ndx_fl_novela_specpath)
+load_namespaces(ndx_franklab_novela_specpath)
diff --git a/src/pynwb/ndx_fl_novela/associated_files.py → ...b/ndx_franklab_novela/associated_files.py b/src/pynwb/ndx_fl_novela/associated_files.py → ...b/ndx_franklab_novela/associated_files.py
diff --git a/src/pynwb/ndx_fl_novela/header_device.py → ...ynwb/ndx_franklab_novela/header_device.py b/src/pynwb/ndx_fl_novela/header_device.py → ...ynwb/ndx_franklab_novela/header_device.py
diff --git a/...ynwb/ndx_fl_novela/nwb_electrode_group.py → ...dx_franklab_novela/nwb_electrode_group.py b/...ynwb/ndx_fl_novela/nwb_electrode_group.py → ...dx_franklab_novela/nwb_electrode_group.py
diff --git a/src/pynwb/ndx_fl_novela/probe.py → src/pynwb/ndx_franklab_novela/probe.py b/src/pynwb/ndx_fl_novela/probe.py → src/pynwb/ndx_franklab_novela/probe.py
diff --git a/.../spec/ndx-franklab-novela.extensions.yaml → .../spec/ndx-franklab-novela.extensions.yaml b/.../spec/ndx-franklab-novela.extensions.yaml → .../spec/ndx-franklab-novela.extensions.yaml
diff --git a/...a/spec/ndx-franklab-novela.namespace.yaml → ...a/spec/ndx-franklab-novela.namespace.yaml b/...a/spec/ndx-franklab-novela.namespace.yaml → ...a/spec/ndx-franklab-novela.namespace.yaml
diff --git a/src/pynwb/tests/test_associated_files.py b/src/pynwb/tests/test_associated_files.py
@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from src.pynwb.ndx_fl_novela.associated_files import AssociatedFiles
+from src.pynwb.ndx_franklab_novela.associated_files import AssociatedFiles
 
 
 class TestApparatus(TestCase):

diff --git a/src/pynwb/tests/test_header_device.py b/src/pynwb/tests/test_header_device.py
@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from src.pynwb.ndx_fl_novela.header_device import HeaderDevice
+from src.pynwb.ndx_franklab_novela.header_device import HeaderDevice
 
 
 class TestHeaderDevice(TestCase):

diff --git a/src/pynwb/tests/test_nwbElectrodeGroup.py b/src/pynwb/tests/test_nwbElectrodeGroup.py
@@ -3,7 +3,7 @@
 
 from pynwb.device import Device
 
-from src.pynwb.ndx_fl_novela.nwb_electrode_group import NwbElectrodeGroup
+from src.pynwb.ndx_franklab_novela.nwb_electrode_group import NwbElectrodeGroup
 
 
 class TestNwbElectrodeGroup(unittest.TestCase):

diff --git a/src/pynwb/tests/test_probe.py b/src/pynwb/tests/test_probe.py
@@ -1,7 +1,7 @@
 import unittest
 from unittest.mock import Mock
 
-from src.pynwb.ndx_fl_novela.probe import Probe, ShanksElectrode, Shank
+from src.pynwb.ndx_franklab_novela.probe import Probe, ShanksElectrode, Shank
 
 
 class TestShanksElectrode(unittest.TestCase):

diff --git a/src/pynwb/tests/test_read_nwb.py b/src/pynwb/tests/test_read_nwb.py
@@ -9,9 +9,9 @@
 from pynwb.device import Device
 from pynwb.testing import TestCase
 
-from src.pynwb.ndx_fl_novela.header_device import HeaderDevice
-from src.pynwb.ndx_fl_novela.nwb_electrode_group import NwbElectrodeGroup
-from src.pynwb.ndx_fl_novela.probe import Probe, Shank, ShanksElectrode
+from src.pynwb.ndx_franklab_novela.header_device import HeaderDevice
+from src.pynwb.ndx_franklab_novela.nwb_electrode_group import NwbElectrodeGroup
+from src.pynwb.ndx_franklab_novela.probe import Probe, Shank, ShanksElectrode
 
 
 class TestNWBFileReading(TestCase):