Merge branch 'hotfix/2.0.8'

Author: oliche

ibllib/pipes/ephys_preprocessing.py

@@ -139,16 +139,18 @@ def _run_pykilosort(self, ap_file):
         """
         self.version = self._fetch_pykilosort_version(self.PYKILOSORT_REPO)
         label = ap_file.parts[-2]  # this is usually the probe name
-        if ap_file.parent.joinpath(f"spike_sorting_{self.SPIKE_SORTER_NAME}.log").exists():
-            _logger.info(f"Already ran: spike_sorting_{self.SPIKE_SORTER_NAME}.log"
-                         f" found for {ap_file}, skipping.")
-            return ap_file.parent
-        sorter_dir = self.session_path.joinpath("spike_sorters", self.SPIKE_SORTER_NAME, label)
-        print(sorter_dir.joinpath(f"spike_sorting_{self.SPIKE_SORTER_NAME}.log"))
-        if sorter_dir.joinpath(f"spike_sorting_{self.SPIKE_SORTER_NAME}.log").exists():
-            _logger.info(f"Already ran: spike_sorting_{self.SPIKE_SORTER_NAME}.log"
-                         f" found in {sorter_dir}, skipping.")
-            return sorter_dir
+        FORCE_RERUN = True
+        if not FORCE_RERUN:
+            if ap_file.parent.joinpath(f"spike_sorting_{self.SPIKE_SORTER_NAME}.log").exists():
+                _logger.info(f"Already ran: spike_sorting_{self.SPIKE_SORTER_NAME}.log"
+                             f" found for {ap_file}, skipping.")
+                return ap_file.parent
+            sorter_dir = self.session_path.joinpath("spike_sorters", self.SPIKE_SORTER_NAME, label)
+            print(sorter_dir.joinpath(f"spike_sorting_{self.SPIKE_SORTER_NAME}.log"))
+            if sorter_dir.joinpath(f"spike_sorting_{self.SPIKE_SORTER_NAME}.log").exists():
+                _logger.info(f"Already ran: spike_sorting_{self.SPIKE_SORTER_NAME}.log"
+                             f" found in {sorter_dir}, skipping.")
+                return sorter_dir
         # get the scratch drive from the shell script
         with open(self.SHELL_SCRIPT) as fid:
             lines = fid.readlines()

release_notes.md

@@ -18,6 +18,8 @@
 - ephyscellsqc: bugfix on probe creation for pykilosort subfolder
 - task version 6.2.5 specific audio extractor
 - camera times: index by video length when GPIO unstable
+### Release Notes 2.0.7 2021-09-17
+- spike sorting tasks re-run fully each time
 
 ### Release Notes 2.0.0 2021-08-04
 - ONE2 released on the master branch

setup.py

@@ -24,7 +24,7 @@
 
 setup(
     name='ibllib',
-    version='2.0.7',
+    version='2.0.8',
     python_requires='>={}.{}'.format(*REQUIRED_PYTHON),
     description='IBL libraries',
     license="MIT",