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' diff --git a/neuroscout_cli/commands/run.py b/neuroscout_cli/commands/run.py index 9a9437f..95d168b 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}' @@ -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 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