From 8cdce51926b1138282c8ed2cd3043abdf24a07bc Mon Sep 17 00:00:00 2001 From: Alejandro de la Vega Date: Thu, 15 Jul 2021 16:56:28 -0500 Subject: [PATCH 1/4] Ignore regressor JSONs --- neuroscout_cli/commands/run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neuroscout_cli/commands/run.py b/neuroscout_cli/commands/run.py index 9a9437f..3f506e0 100644 --- a/neuroscout_cli/commands/run.py +++ b/neuroscout_cli/commands/run.py @@ -43,7 +43,7 @@ def run(self, upload_only=False): str(out_dir), 'dataset', f'--model={model_path}', - '--ignore=/(.*desc-confounds_regressors.tsv)/', + '--ignore=/(.*desc-confounds_regressors.*)/', f'--derivatives={str(self.bundle_dir.absolute())} {str(self.preproc_dir.absolute())}', f'--smoothing={smoothing}:Dataset', f'--estimator={estimator}' From a43631a1ae1819e2301c4d7597125ef9444eb341 Mon Sep 17 00:00:00 2001 From: Alejandro de la Vega Date: Tue, 10 Aug 2021 17:53:04 -0500 Subject: [PATCH 2/4] Fix re match --- Dockerfile | 2 +- neuroscout_cli/commands/run.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a96354e..0d2431d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM poldracklab/fitlins:0.9.1 +FROM poldracklab/fitlins:0.9.2 # Set user back to root USER root diff --git a/neuroscout_cli/commands/run.py b/neuroscout_cli/commands/run.py index 3f506e0..95d168b 100644 --- a/neuroscout_cli/commands/run.py +++ b/neuroscout_cli/commands/run.py @@ -109,11 +109,11 @@ def run(self, upload_only=False): group = [str(i) for i in images.glob('*statmap.nii.gz') if re.match( - '.*stat-[t|F|variance|effect]+.*', i.name)] + '.*stat-(t|F|variance|effect)+.*', i.name)] if neurovault == 'all': sub = [str(i) for i in images.glob('sub*/*statmap.nii.gz') - if re.match('.*stat-[variance|effect]+.*', i.name)] + if re.match('.*stat-(variance|effect)+.*', i.name)] else: sub = None From b0dc1a76854447770893fc2729ff28ef5e0585c7 Mon Sep 17 00:00:00 2001 From: Alejandro de la Vega Date: Wed, 11 Aug 2021 13:15:16 -0500 Subject: [PATCH 3/4] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5e7d4cb..c84f857 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ docopt==0.6.2 datalad==0.10.2 tqdm -pyns==0.4.6 +pyns==0.4.7 git+https://github.com/bids-standard/pybids.git@maint/0.13.x From 9a11616f9911961cf67fe4426a9bbd710d17a1fc Mon Sep 17 00:00:00 2001 From: Alejandro de la Vega Date: Wed, 11 Aug 2021 13:37:06 -0500 Subject: [PATCH 4/4] Update __init__.py --- neuroscout_cli/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neuroscout_cli/__init__.py b/neuroscout_cli/__init__.py index 45869b6..ed7d50e 100644 --- a/neuroscout_cli/__init__.py +++ b/neuroscout_cli/__init__.py @@ -1 +1 @@ -__version__ = '0.5.2' +__version__ = '0.5.3'