Skip to content

Commit 6215779

Browse files
committed
[TST] Add heavily-nonuniform boldrefs for regression tests
Refs. #1000, #1050, #1321. Also includes a new filter of branches so builds other than tests are skipped if the name of the branch starts with ``tests?/``.
1 parent 3c6303d commit 6215779

File tree

2 files changed

+26
-8
lines changed

2 files changed

+26
-8
lines changed

.circleci/config.yml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ jobs:
165165
steps:
166166
- restore_cache:
167167
keys:
168-
- regression-v0-{{ epoch }}
169-
- regression-v0-
168+
- regression-v1-{{ epoch }}
169+
- regression-v1-
170170
- run:
171171
name: Get truncated BOLD series
172172
command: |
@@ -193,7 +193,7 @@ jobs:
193193
paths:
194194
- data
195195
- save_cache:
196-
key: regression-v0-{{ epoch }}
196+
key: regression-v1-{{ epoch }}
197197
paths:
198198
- /tmp/data
199199

@@ -719,7 +719,9 @@ workflows:
719719
- get_data:
720720
filters:
721721
branches:
722-
ignore: /docs?\/.*/
722+
ignore:
723+
- /docs?\/.*/
724+
- /tests?\/.*/
723725
tags:
724726
only: /.*/
725727

@@ -740,7 +742,9 @@ workflows:
740742
- build
741743
filters:
742744
branches:
743-
ignore: /docs?\/.*/
745+
ignore:
746+
- /docs?\/.*/
747+
- /tests?\/.*/
744748
tags:
745749
only: /.*/
746750

@@ -760,7 +764,9 @@ workflows:
760764
- build
761765
filters:
762766
branches:
763-
ignore: /docs?\/.*/
767+
ignore:
768+
- /docs?\/.*/
769+
- /tests?\/.*/
764770
tags:
765771
only: /.*/
766772

@@ -770,7 +776,9 @@ workflows:
770776
- build
771777
filters:
772778
branches:
773-
ignore: /docs?\/.*/
779+
ignore:
780+
- /docs?\/.*/
781+
- /tests?\/.*/
774782
tags:
775783
only: /.*/
776784

@@ -781,7 +789,9 @@ workflows:
781789
filters:
782790
branches:
783791
# only: /meepi.*/
784-
ignore: /docs?\/.*/
792+
ignore:
793+
- /docs?\/.*/
794+
- /tests?\/.*/
785795
tags:
786796
only: /.*/
787797

fmriprep/workflows/bold/tests/test_util.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,14 @@ def symmetric_overlap(img1, img2):
4646
'ds000216/sub-03_task-rest_echo-4_bold.nii.gz',
4747
'ds000237/sub-03_task-MemorySpan_acq-multiband_run-01_bold.nii.gz',
4848
'ds000237/sub-06_task-MemorySpan_acq-multiband_run-01_bold.nii.gz',
49+
'ds001240/sub-26_task-localizerimagination_bold.nii.gz',
50+
'ds001240/sub-26_task-localizerviewing_bold.nii.gz',
51+
'ds001240/sub-26_task-molencoding_run-01_bold.nii.gz',
52+
'ds001240/sub-26_task-molencoding_run-02_bold.nii.gz',
53+
'ds001240/sub-26_task-molretrieval_run-01_bold.nii.gz',
54+
'ds001240/sub-26_task-molretrieval_run-02_bold.nii.gz',
55+
'ds001240/sub-26_task-rest_bold.nii.gz',
56+
'ds001362/sub-01_task-taskname_run-01_bold.nii.gz',
4957
)
5058
])
5159
def test_masking(input_fname, expected_fname):

0 commit comments

Comments
 (0)