From 83255f09ee7df9b0c5ee47be354cf58dc210fc82 Mon Sep 17 00:00:00 2001 From: Miles Wells Date: Thu, 14 Nov 2024 11:47:16 +0200 Subject: [PATCH 1/2] Skip test subjects in job creator; resolves https://github.com/int-brain-lab/iblscripts/issues/104 --- ibllib/pipes/local_server.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ibllib/pipes/local_server.py b/ibllib/pipes/local_server.py index 88fa27ebe..cb93d786d 100644 --- a/ibllib/pipes/local_server.py +++ b/ibllib/pipes/local_server.py @@ -17,6 +17,8 @@ from one.api import ONE from one.webclient import AlyxClient from one.remote.globus import get_lab_from_endpoint_id, get_local_endpoint_id +from one.alf.spec import is_session_path +from one.alf.path import session_path_parts from ibllib import __version__ as ibllib_version from ibllib.pipes import tasks @@ -104,11 +106,15 @@ def job_creator(root_path, one=None, dry=False, rerun=False): if not one: one = ONE(cache_rest=None) rc = IBLRegistrationClient(one=one) - flag_files = list(Path(root_path).glob('**/raw_session.flag')) + flag_files = Path(root_path).glob('*/????-??-??/*/raw_session.flag') + flag_files = filter(lambda x: is_session_path(x.parent), flag_files) pipes = [] all_datasets = [] for flag_file in flag_files: session_path = flag_file.parent + if session_path_parts(session_path)[1] in ('test', 'test_subject'): + _logger.debug('skipping test session %s', session_path) + continue _logger.info(f'creating session for {session_path}') if dry: continue From b501001213411e25c1a82cd0f882947216c524b1 Mon Sep 17 00:00:00 2001 From: Miles Wells Date: Mon, 18 Nov 2024 22:19:20 +0200 Subject: [PATCH 2/2] Update readme --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 46baec1ec..0f1086a97 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# IBL Python Libraries -[![Coverage badge](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fibllib.hooks.internationalbrainlab.org%2Fcoverage%2Fibllib%2Fmaster)](https://ibllib.hooks.internationalbrainlab.org/coverage/master) +# IBL Python Libraries +[![Coverage badge](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fibllib.hooks.internationalbrainlab.org%2Fcoverage%2Fibllib%2Fmaster)](https://ibllib.hooks.internationalbrainlab.org/coverage/master) [![Tests status badge](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fibllib.hooks.internationalbrainlab.org%2Ftests%2Fibllib%2Fmaster)](https://ibllib.hooks.internationalbrainlab.org/logs/records/master) [![Tests status badge](https://img.shields.io/endpoint?label=develop&url=https%3A%2F%2Fibllib.hooks.internationalbrainlab.org%2Ftests%2Fibllib%2Fdevelop)](https://ibllib.hooks.internationalbrainlab.org/logs/records/develop) @@ -14,7 +14,7 @@ The library is currently 2 main modules: ## Requirements **OS**: Only tested on Linux. Windows and Mac may work, but are not supported. -**Python Module**: Python 3.8 or higher +**Python Module**: Python 3.10 or higher ## Installation, documentation and examples https://docs.internationalbrainlab.org @@ -23,7 +23,7 @@ https://docs.internationalbrainlab.org ## Contribution and development practices See https://int-brain-lab.github.io/iblenv/07_contribution.html -We use gitflow and Semantic Versioning. +We use Semantic Versioning. Before committing to your branch: - run tests