Skip to content

Commit 4082203

Browse files
committed
Merge branch 'remove-tdc-from-testing' into python-3.13
2 parents 30f5f9c + f6afa29 commit 4082203

3 files changed

Lines changed: 5 additions & 14 deletions

File tree

pyproject.toml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,6 @@ test = [
165165
# for sortingview backend
166166
"sortingview",
167167

168-
169-
## install tridesclous for testing ##
170-
"tridesclous>=1.6.8",
171-
172-
## sliding_nn
173-
"pymde",
174-
"torch",
175-
"pynndescent",
176-
177168
# curation
178169
"skops",
179170
"huggingface_hub",

src/spikeinterface/core/loading.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ def _guess_object_from_local_folder(folder):
197197
spikeinterface_info = json.load(f)
198198
return _guess_object_from_dict(spikeinterface_info)
199199
elif (folder / "waveforms").is_dir():
200-
# before the SortingAnlazer, it was WaveformsExtractor (v<0.101)
201-
return "WaveformsExtractor"
200+
# before the SortingAnlazer, it was WaveformExtractor (v<0.101)
201+
return "WaveformExtractor"
202202
elif (folder / f"si_folder.json").is_file():
203203
# In later versions (0.94<v<0.102) we use the si_folder.json file
204204
# This should be Recording | Sorting
@@ -225,7 +225,7 @@ def _load_object_from_folder(folder, object_type, **kwargs):
225225
motion = Motion.load(folder)
226226
return motion
227227

228-
elif object_type == "Waveforms":
228+
elif object_type == "WaveformExtractor":
229229
from .waveforms_extractor_backwards_compatibility import load_waveforms
230230

231231
analyzer = load_waveforms(folder, output="SortingAnalyzer")

src/spikeinterface/sorters/tests/test_runsorter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ def test_run_sorter_local(generate_recording, create_cache_folder):
2929
recording = generate_recording
3030
cache_folder = create_cache_folder
3131

32-
sorter_params = {"detect_threshold": 4.9}
32+
sorter_params = {"detection": {"detect_threshold": 4.9}}
3333

3434
sorting = run_sorter(
35-
"tridesclous",
35+
"tridesclous2",
3636
recording,
3737
output_folder=cache_folder / "sorting_tdc_local",
3838
remove_existing_folder=True,

0 commit comments

Comments
 (0)