Merge branch 'user/wmerynda/import_directly' into user/wmerynda/versi…

…on_0.0.008
NovelaNeuro · Jun 24, 2020 · 04fdb5c · 04fdb5c
2 parents b36dcaa + 7c82c7b
commit 04fdb5c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/src/pynwb/ndx_franklab_novela/__init__.py b/src/pynwb/ndx_franklab_novela/__init__.py
@@ -3,13 +3,6 @@
 from pynwb import load_namespaces
 
 # Set path of the namespace.yaml file to the expected install location
-from src.pynwb.ndx_franklab_novela.associated_files import AssociatedFiles
-from src.pynwb.ndx_franklab_novela.camera_device import CameraDevice
-from src.pynwb.ndx_franklab_novela.data_acq_device import DataAcqDevice
-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.nwb_image_series import NwbImageSeries
-from src.pynwb.ndx_franklab_novela.probe import Probe
 
 ndx_franklab_novela_specpath = os.path.join(
     os.path.dirname(__file__),
@@ -29,3 +22,11 @@
 
 # Load the namespace
 load_namespaces(ndx_franklab_novela_specpath)
+
+from .associated_files import AssociatedFiles
+from .camera_device import CameraDevice
+from .data_acq_device import DataAcqDevice
+from .header_device import HeaderDevice
+from .nwb_electrode_group import NwbElectrodeGroup
+from .nwb_image_series import NwbImageSeries
+from .probe import Probe, Shank, ShanksElectrode
diff --git a/src/pynwb/tests/test_read_nwb.py b/src/pynwb/tests/test_read_nwb.py
@@ -9,12 +9,12 @@
 from pynwb.device import Device
 from pynwb.testing import TestCase
 
-from src.pynwb.ndx_franklab_novela.camera_device import CameraDevice
-from src.pynwb.ndx_franklab_novela.data_acq_device import DataAcqDevice
-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.nwb_image_series import NwbImageSeries
-from src.pynwb.ndx_franklab_novela.probe import Probe, Shank, ShanksElectrode
+from src.pynwb.ndx_franklab_novela import CameraDevice
+from src.pynwb.ndx_franklab_novela import DataAcqDevice
+from src.pynwb.ndx_franklab_novela import HeaderDevice
+from src.pynwb.ndx_franklab_novela import NwbElectrodeGroup
+from src.pynwb.ndx_franklab_novela import NwbImageSeries
+from src.pynwb.ndx_franklab_novela import Probe, Shank, ShanksElectrode
 
 
 class TestNWBFileReading(TestCase):