Skip to content

Commit 516a874

Browse files
authored
Merge pull request #767 from effigies/test/regressors_tsv_gz
FIX/TEST: gunzip regressors.tsv.gz, allow timeseries.tsv as well
2 parents 90bd362 + 69aecdf commit 516a874

File tree

61 files changed

+1953
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1953
-2
lines changed

bids/tests/data/synthetic/derivatives/fmriprep/sub-01/ses-01/func/sub-01_ses-01_task-nback_run-01_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-01/ses-01/func/sub-01_ses-01_task-nback_run-02_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-01/ses-01/func/sub-01_ses-01_task-rest_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-01/ses-02/func/sub-01_ses-02_task-nback_run-01_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-01/ses-02/func/sub-01_ses-02_task-nback_run-02_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-01/ses-02/func/sub-01_ses-02_task-rest_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-02/ses-01/func/sub-02_ses-01_task-nback_run-01_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-02/ses-01/func/sub-02_ses-01_task-nback_run-02_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-02/ses-01/func/sub-02_ses-01_task-rest_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-02/ses-02/func/sub-02_ses-02_task-nback_run-01_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-02/ses-02/func/sub-02_ses-02_task-nback_run-02_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-02/ses-02/func/sub-02_ses-02_task-rest_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-03/ses-01/func/sub-03_ses-01_task-nback_run-01_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-03/ses-01/func/sub-03_ses-01_task-nback_run-02_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-03/ses-01/func/sub-03_ses-01_task-rest_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-03/ses-02/func/sub-03_ses-02_task-nback_run-01_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-03/ses-02/func/sub-03_ses-02_task-nback_run-02_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-03/ses-02/func/sub-03_ses-02_task-rest_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-04/ses-01/func/sub-04_ses-01_task-nback_run-01_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-04/ses-01/func/sub-04_ses-01_task-nback_run-02_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-04/ses-01/func/sub-04_ses-01_task-rest_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-04/ses-02/func/sub-04_ses-02_task-nback_run-01_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-04/ses-02/func/sub-04_ses-02_task-nback_run-02_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-04/ses-02/func/sub-04_ses-02_task-rest_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-05/ses-01/func/sub-05_ses-01_task-nback_run-01_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-05/ses-01/func/sub-05_ses-01_task-nback_run-02_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-05/ses-01/func/sub-05_ses-01_task-rest_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-05/ses-02/func/sub-05_ses-02_task-nback_run-01_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-05/ses-02/func/sub-05_ses-02_task-nback_run-02_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/tests/data/synthetic/derivatives/fmriprep/sub-05/ses-02/func/sub-05_ses-02_task-rest_desc-confounds_regressors.tsv

+65
Large diffs are not rendered by default.

bids/variables/io.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,9 @@ def _load_time_variables(layout, dataset=None, columns=None, scan_length=None,
303303
if regressors:
304304
sub_ents = {k: v for k, v in entities.items()
305305
if k in BASE_ENTITIES}
306-
confound_files = layout.get(suffix='regressors', scope=scope,
307-
extension='.tsv', **sub_ents)
306+
confound_files = layout.get(suffix=['regressors', 'timeseries'],
307+
scope=scope, extension='.tsv',
308+
**sub_ents)
308309
for cf in confound_files:
309310
_data = pd.read_csv(cf.path, sep='\t', na_values='n/a')
310311
if columns is not None:

0 commit comments

Comments
 (0)