Merge pull request #435 from SpikeInterface/update_tests

Update tests

Author: alejoe91

.travis.yml

@@ -6,8 +6,7 @@ services:
 python:
 - '3.6'
 install:
-# - pip install shybrid
-- pip install mountainlab_pytools pynwb==1.3.3 pyopenephys kbucket h5py MEArec==1.4.1 exdir ruamel.yaml nixio neo>=0.8 hdf5storage bs4 lxml
+- pip install mountainlab_pytools pynwb==1.3.3 pyopenephys kbucket h5py MEArec shybrid exdir ruamel.yaml nixio neo>=0.8 hdf5storage bs4 lxml
 - pip install .
 - pip install pytest==3.6
 script: pytest

spikeextractors/extractors/nwbextractors/nwbextractors.py

@@ -499,8 +499,11 @@ def add_epochs(recording, nwbfile):
         return nwbfile
 
     @staticmethod
-    def add_all_to_nwbfile(recording: se.RecordingExtractor, nwbfile: NWBFile,
+    def add_all_to_nwbfile(recording: se.RecordingExtractor, nwbfile,
                            metadata: dict = None):
+
+        assert isinstance(nwbfile, NWBFile), "'nwbfile' should be of type pynwb.NWBFile"
+
         # Add devices
         nwbfile = se.NwbRecordingExtractor.add_devices(
             recording=recording,
@@ -537,7 +540,7 @@ def add_all_to_nwbfile(recording: se.RecordingExtractor, nwbfile: NWBFile,
 
     @staticmethod
     def write_recording(recording: se.RecordingExtractor, save_path: PathType = None,
-                        nwbfile: NWBFile = None, metadata: dict = None):
+                        nwbfile=None, metadata: dict = None):
         '''
         Parameters
         ----------
@@ -559,6 +562,9 @@ def write_recording(recording: se.RecordingExtractor, save_path: PathType = None
         '''
         assert HAVE_NWB, NwbRecordingExtractor.installation_mesg
 
+        if nwbfile is not None:
+            assert isinstance(nwbfile, NWBFile), "'nwbfile' should be of type pynwb.NWBFile"
+
         assert distutils.version.LooseVersion(pynwb.__version__) >= '1.3.3', \
             "'write_recording' not supported for version < 1.3.3. Run pip install --upgrade pynwb"
 
@@ -720,7 +726,7 @@ def frame_to_time(self, frame):
         return frame / self.get_sampling_frequency()
 
     @staticmethod
-    def write_units(sorting: se.SortingExtractor, nwbfile: NWBFile,
+    def write_units(sorting: se.SortingExtractor, nwbfile,
                     property_descriptions: dict):
         '''
         Helper function for write_sorting.
@@ -829,7 +835,7 @@ def write_units(sorting: se.SortingExtractor, nwbfile: NWBFile,
 
     @staticmethod
     def write_sorting(sorting: se.SortingExtractor, save_path: PathType = None,
-                      nwbfile: NWBFile = None, property_descriptions: dict = None,
+                      nwbfile=None, property_descriptions: dict = None,
                       **nbwbfile_kwargs):
         '''
         Parameters
@@ -881,5 +887,6 @@ def write_sorting(sorting: se.SortingExtractor, save_path: PathType = None,
 
                 io.write(nwbfile)
         else:
+            assert isinstance(nwbfile, NWBFile), "'nwbfile' should be of type pynwb.NWBFile"
             se.NwbSortingExtractor.write_units(sorting, nwbfile,
                                                property_descriptions)