Merge 0484dea into f7e5404

jpgill86 · Dec 9, 2022 · 551f7f7 · 551f7f7
2 parents f7e5404 + 0484dea
commit 551f7f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/neurotic/datasets/data.py b/neurotic/datasets/data.py
@@ -90,7 +90,7 @@ def load_dataset(metadata, blk=None, lazy=False, signal_group_mode='split-all',
 
     # classify spikes by amplitude if not using lazy loading of signals
     if not lazy:
-        blk.segments[0].spiketrains += _run_amplitude_discriminators(metadata, blk)
+        blk.segments[0].spiketrains.extend(_run_amplitude_discriminators(metadata, blk))
 
     # read in spikes identified by spike sorting using tridesclous
     spikes_dataframe = _read_spikes_file(metadata, blk)
@@ -99,7 +99,7 @@ def load_dataset(metadata, blk=None, lazy=False, signal_group_mode='split-all',
             t_start = blk.segments[0].analogsignals[0].t_start                 # assuming all AnalogSignals start at the same time
             t_stop = blk.segments[0].analogsignals[0].t_stop                   # assuming all AnalogSignals start at the same time
             sampling_period = blk.segments[0].analogsignals[0].sampling_period # assuming all AnalogSignals have the same sampling rate
-            blk.segments[0].spiketrains += _create_neo_spike_trains_from_dataframe(spikes_dataframe, metadata, t_start, t_stop, sampling_period)
+            blk.segments[0].spiketrains.extend(_create_neo_spike_trains_from_dataframe(spikes_dataframe, metadata, t_start, t_stop, sampling_period))
         else:
             logger.warning('Ignoring tridesclous_file because the sampling rate and start time could not be inferred from analog signals')
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 # av  # required but typically not installable via pip, try `conda install -c conda-forge av`
 ephyviewer>=1.3.0
-neo>=0.7.2,<0.10.0  # TODO: fix for neo>=0.10
+neo>=0.7.2
 numpy
 packaging
 pandas