Merge branch 'main' into prepare_release

Author: alejoe91

src/spikeinterface/benchmark/benchmark_base.py

@@ -430,7 +430,7 @@ def load_folder(cls, folder):
 
                 result[k] = load(folder / k)
             elif format == "Motion":
-                from spikeinterface.sortingcomponents.motion import Motion
+                from spikeinterface.core.motion import Motion
 
                 result[k] = Motion.load(folder / k)
             elif format == "zarr_templates":

src/spikeinterface/benchmark/benchmark_motion_estimation.py

@@ -8,15 +8,15 @@
 import numpy as np
 
 from spikeinterface.core import get_noise_levels
-from .benchmark_base import Benchmark, BenchmarkStudy
-from .benchmark_plot_tools import _simpleaxis
+from spikeinterface.core.motion import Motion
 from spikeinterface.sortingcomponents.motion import estimate_motion
 from spikeinterface.sortingcomponents.peak_detection import detect_peaks
 from spikeinterface.sortingcomponents.peak_selection import select_peaks
 from spikeinterface.sortingcomponents.peak_localization import localize_peaks
 from spikeinterface.widgets import plot_probe_map
 
-from spikeinterface.sortingcomponents.motion import Motion
+from .benchmark_base import Benchmark, BenchmarkStudy
+from .benchmark_plot_tools import _simpleaxis
 
 # import MEArec as mr
 

src/spikeinterface/core/core_tools.py

@@ -75,7 +75,7 @@ class SIJsonEncoder(json.JSONEncoder):
 
     def default(self, obj):
         from spikeinterface.core.base import BaseExtractor
-        from spikeinterface.sortingcomponents.motion.motion_utils import Motion
+        from spikeinterface.core.motion import Motion
 
         # Over-write behaviors for datetime object
         if isinstance(obj, datetime.datetime):
@@ -461,7 +461,6 @@ def make_paths_absolute(input_dict, base_folder) -> dict:
     path_elements_in_dict = [e for e in extractor_dict_iterator(input_dict) if element_is_path(e)]
     output_dict = deepcopy(input_dict)
 
-    output_dict = deepcopy(input_dict)
     for element in path_elements_in_dict:
         absolute_path = (base_folder / element.value).resolve()
         if Path(absolute_path).exists():