Merge branch 'master' into release-notes-0.10

Author: apdavison

neo/io/__init__.py

@@ -44,6 +44,7 @@
 * :attr:`NeuroScopeIO`
 * :attr:`NeuroshareIO`
 * :attr:`NixIO`
+* :attr:`NWBIO`
 * :attr:`OpenEphysIO`
 * :attr:`OpenEphysBinaryIO`
 * :attr:`PhyIO`
@@ -185,6 +186,10 @@
 
     .. autoattribute:: extensions
 
+.. autoclass:: neo.io.NWBIO
+
+    .. autoattribute:: extensions
+
 .. autoclass:: neo.io.OpenEphysIO
 
     .. autoattribute:: extensions
@@ -297,6 +302,7 @@
 from neo.io.neuroscopeio import NeuroScopeIO
 from neo.io.nixio import NixIO
 from neo.io.nixio_fr import NixIO as NixIOFr
+from neo.io.nwbio import NWBIO
 from neo.io.openephysio import OpenEphysIO
 from neo.io.openephysbinaryio import OpenEphysBinaryIO
 from neo.io.phyio import PhyIO
@@ -346,6 +352,7 @@
     NeuroExplorerIO,
     NeuroScopeIO,
     NeuroshareIO,
+    NWBIO,
     OpenEphysIO,
     OpenEphysBinaryIO,
     PhyIO,

neo/io/asciisignalio.py

@@ -195,7 +195,8 @@ def read_segment(self, lazy=False):
                                 delimiter=self.delimiter,
                                 usecols=self.usecols,
                                 skip_header=self.skiprows,
-                                dtype='f')
+                                dtype='f',
+                                invalid_raise=False)
             if len(sig.shape) == 1:
                 sig = sig[:, np.newaxis]
         elif self.method == 'csv':