Merge branch 'hotfix/2.3.1'

int-brain-lab · Nov 5, 2021 · 13d00dc · 13d00dc
2 parents 5ca5764 + 3b70c10
commit 13d00dc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/ibllib/pipes/tasks.py b/ibllib/pipes/tasks.py
@@ -95,28 +95,28 @@ def run(self, **kwargs):
             _logger.info(f"Running on machine: {self.machine}")
         _logger.info(f"running ibllib version {version.ibllib()}")
         # setup
-        setup = self.setUp(**kwargs)
-        _logger.info(f"Setup value is: {setup}")
-        self.status = 0
-        if not setup:
-            # case where outputs are present but don't have input files locally to rerun task
-            # label task as complete
-            _, self.outputs = self.assert_expected_outputs()
-        else:
-            # run task
+        try:
             start_time = time.time()
-            try:
+            setup = self.setUp(**kwargs)
+            _logger.info(f"Setup value is: {setup}")
+            self.status = 0
+            if not setup:
+                # case where outputs are present but don't have input files locally to rerun task
+                # label task as complete
+                _, self.outputs = self.assert_expected_outputs()
+            else:
+                # run task
                 if self.gpu >= 1:
                     if not self._creates_lock():
                         self.status = -2
                         _logger.info(f"Job {self.__class__} exited as a lock was found")
                         return
                 self.outputs = self._run(**kwargs)
                 _logger.info(f"Job {self.__class__} complete")
-            except BaseException:
-                _logger.error(traceback.format_exc())
-                _logger.info(f"Job {self.__class__} errored")
-                self.status = -1
+        except BaseException:
+            _logger.error(traceback.format_exc())
+            _logger.info(f"Job {self.__class__} errored")
+            self.status = -1
             self.time_elapsed_secs = time.time() - start_time
 
         # log the outputs

diff --git a/release_notes.md b/release_notes.md
@@ -1,4 +1,7 @@
 ## Release Notes 2.3
+### Release Notes 2.3.1 2021-11-5
+- Add setup method in tasks.py into try except to catch globus download errors
+
 ### Release Notes 2.3.0 2021-11-4
 - Add input and output signatures to all ephys tasks
 - Add datahandler to task to download and upload data based on location where task is run

diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@
 
 setup(
     name='ibllib',
-    version='2.3.0',
+    version='2.3.1',
     python_requires='>={}.{}'.format(*REQUIRED_PYTHON),
     description='IBL libraries',
     license="MIT",