Merge pull request #594 from int-brain-lab/fix_passive_ntrials

Fix passive ntrials

Author: juhuntenburg

ibllib/__init__.py

@@ -2,7 +2,7 @@
 import logging
 import warnings
 
-__version__ = '2.21.2'
+__version__ = '2.21.3'
 warnings.filterwarnings('always', category=DeprecationWarning, module='ibllib')
 
 # if this becomes a full-blown library we should let the logging configuration to the discretion of the dev

ibllib/oneibl/registration.py

@@ -261,6 +261,8 @@ def register_session(self, ses_path, file_list=True, projects=None, procedures=N
         # create associated water administration if not found
         if not session['wateradmin_session_related'] and any(task_data):
             for md, d in zip(settings, task_data):
+                if d is None:
+                    continue
                 _, _end_time = _get_session_times(ses_path, md, d)
                 user = md.get('PYBPOD_CREATOR')
                 user = user[0] if user[0] in users else self.one.alyx.user
@@ -426,6 +428,8 @@ def _get_session_performance(md, ses_data):
     else:
         assert isinstance(ses_data, (list, tuple)) and len(ses_data) == len(md)
 
+    # For now just remove missing session data, long run move this function into extractors
+    ses_data = [sd for sd in ses_data if sd]
     n_trials = [x[-1]['trial_num'] for x in ses_data]
     # checks that the number of actual trials and labeled number of trials check out
     assert all(len(x) == n for x, n in zip(ses_data, n_trials))

requirements.txt

@@ -2,7 +2,7 @@ boto3
 click>=7.0.0
 colorlog>=4.0.2
 flake8>=3.7.8
-globus-sdk==3.2.1
+globus-sdk
 graphviz
 matplotlib>=3.0.3
 mtscomp>=1.0.1