Skip to content

Commit 7e24297

Browse files
committed
Merge branch 'release/2.10.6'
2 parents 04b88bf + c895059 commit 7e24297

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

ibllib/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "2.10.5"
1+
__version__ = "2.10.6"
22
import warnings
33

44
from ibllib.misc import logger_config

ibllib/pipes/tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ def run_alyx_task(tdict=None, session_path=None, one=None, job_deck=None,
522522
parent_tasks = filter(lambda x: x['id'] in tdict['parents'], job_deck)
523523
parent_statuses = [j['status'] for j in parent_tasks]
524524
# if any of the parent tasks is not complete, throw a warning
525-
if any(map(lambda s: s != 'Complete', parent_statuses)):
525+
if any(map(lambda s: s not in ['Complete', 'Incomplete'], parent_statuses)):
526526
_logger.warning(f"{tdict['name']} has unmet dependencies")
527527
# if parents are just waiting, don't do anything, but if they have a failed status
528528
# set the current task status to Held

ibllib/plots/figures.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -688,6 +688,9 @@ def dlc_qc_plot(session_path, one=None):
688688
"""
689689

690690
one = one or ONE()
691+
# hack for running on cortexlab local server
692+
if one.alyx.base_url == 'https://alyx.cortexlab.net':
693+
one = ONE(base_url='https://alyx.internationalbrainlab.org')
691694
data = {}
692695
cams = ['left', 'right', 'body']
693696
session_path = Path(session_path)

release_notes.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
## Release Note 2.10
22

3+
## Release Note 2.10.6 2022-03-15
4+
- Allow parent tasks to be 'Incomplete' to run task on local server
5+
- Change one base_rul for dlc_qc_plot on cortexlab
6+
37
## Release Note 2.10.5 2022-03-11
48
- Fix moot release accident
59

0 commit comments

Comments
 (0)