Skip to content

Commit 9087d17

Browse files
authored
Merge pull request #1025 from JuliaSprenger/fix/nix_labels
fix tests with latest nixio release
2 parents 36ed1e8 + 60da2f5 commit 9087d17

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

neo/test/iotest/test_nixio_fr.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ def test_annotations(self):
112112
sp = SpikeTrain([3, 4, 5]* s, t_stop=10.0)
113113
sp.annotations['railway'] = 'hello train'
114114
ev = Event(np.arange(0, 30, 10)*pq.Hz,
115-
labels=np.array(['trig0', 'trig1', 'trig2'], dtype='S'))
115+
labels=np.array(['trig0', 'trig1', 'trig2'], dtype='U'))
116116
ev.annotations['venue'] = 'hello event'
117117
ev2 = Event(np.arange(0, 30, 10) * pq.Hz,
118-
labels=np.array(['trig0', 'trig1', 'trig2'], dtype='S'))
118+
labels=np.array(['trig0', 'trig1', 'trig2'], dtype='U'))
119119
ev2.annotations['evven'] = 'hello ev'
120120
seg.spiketrains.append(sp)
121121
seg.events.append(ev)

0 commit comments

Comments
 (0)