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

Author: wbodo

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)

src/pynwb/ndx_fl_novela/__init__.py renamed to 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)

src/pynwb/ndx_fl_novela/associated_files.py renamed to src/pynwb/ndx_franklab_novela/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):

src/pynwb/ndx_fl_novela/header_device.py renamed to src/pynwb/ndx_franklab_novela/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):