Skip to content

Commit 0a82a7a

Browse files
committed
MAINT: Move regression tests of EPI masks over to Niworkflows
This is the fMRIPrep side of nipreps/niworkflows#371
1 parent bf8a823 commit 0a82a7a

File tree

2 files changed

+2
-159
lines changed

2 files changed

+2
-159
lines changed

.circleci/config.yml

Lines changed: 2 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -176,42 +176,6 @@ jobs:
176176
- /tmp/data
177177
- /tmp/ds005/derivatives/freesurfer
178178

179-
get_regression_data:
180-
machine:
181-
# Ubuntu 14.04 with Docker 17.10.0-ce
182-
image: circleci/classic:201711-01
183-
working_directory: /home/circleci/data
184-
steps:
185-
- restore_cache:
186-
keys:
187-
- regression-v3-{{ .Revision }}
188-
- regression-v3-
189-
- run:
190-
name: Get truncated BOLD series
191-
command: |
192-
mkdir -p /tmp/data
193-
if [[ ! -d /tmp/data/fmriprep_bold_truncated ]]; then
194-
wget --retry-connrefused --waitretry=5 --read-timeout=20 --timeout=15 -t 0 -q \
195-
-O fmriprep_bold_truncated.tar.gz "https://osf.io/286yr/download"
196-
tar xvzf fmriprep_bold_truncated.tar.gz -C /tmp/data/
197-
else
198-
echo "Truncated BOLD series were cached"
199-
fi
200-
- run:
201-
name: Get pre-computed masks
202-
command: |
203-
if [[ ! -d /tmp/data/fmriprep_bold_mask ]]; then
204-
wget --retry-connrefused --waitretry=5 --read-timeout=20 --timeout=15 -t 0 -q \
205-
-O fmriprep_bold_mask.tar.gz "https://osf.io/s4f7b/download"
206-
tar xvzf fmriprep_bold_mask.tar.gz -C /tmp/data/
207-
else
208-
echo "Pre-computed masks were cached"
209-
fi
210-
- save_cache:
211-
key: regression-v3-{{ .Revision }}-{{ epoch }}
212-
paths:
213-
- /tmp/data
214-
215179
test_pytest:
216180
machine:
217181
image: circleci/classic:201711-01
@@ -237,9 +201,6 @@ jobs:
237201
- restore_cache:
238202
keys:
239203
- docker-v3-{{ .Branch }}-{{ .Revision }}
240-
- restore_cache:
241-
keys:
242-
- regression-v3-{{ .Revision }}
243204
- run:
244205
name: Load Docker image layer cache
245206
no_output_timeout: 30m
@@ -258,18 +219,9 @@ jobs:
258219
mkdir /tmp/data/reports && \
259220
docker run -ti --rm=false \
260221
-v /tmp/data:/tmp/data \
261-
-e FMRIPREP_REGRESSION_SOURCE=/tmp/data/fmriprep_bold_truncated \
262-
-e FMRIPREP_REGRESSION_TARGETS=/tmp/data/fmriprep_bold_mask \
263-
-e FMRIPREP_REGRESSION_REPORTS=/tmp/data/reports \
264222
--entrypoint="py.test" poldracklab/fmriprep:latest \
265-
/src/fmriprep/ \
266-
-svx --doctest-modules --ignore=/src/fmriprep/docs --ignore=setup.py
267-
- run:
268-
name: Package new masks
269-
no_output_timeout: 10m
270-
working_directory: /tmp/data/reports
271-
command: |
272-
tar cfz fmriprep_bold_mask.tar.gz fmriprep_bold_mask/*/*.nii.gz
223+
/src/fmriprep/fmriprep -svx --doctest-modules
224+
273225
- run:
274226
name: Test fmriprep-wrapper (Python 2)
275227
command: |
@@ -953,18 +905,6 @@ workflows:
953905
tags:
954906
only: /.*/
955907

956-
- get_regression_data:
957-
filters:
958-
branches:
959-
ignore:
960-
- /docs?\/.*/
961-
- /ds005\/.*/
962-
- /ds054\/.*/
963-
- /ds210\/.*/
964-
- /docker\/.*/
965-
tags:
966-
only: /.*/
967-
968908
- build_docs:
969909
filters:
970910
branches:
@@ -989,7 +929,6 @@ workflows:
989929
- test_pytest:
990930
requires:
991931
- build
992-
- get_regression_data
993932
filters:
994933
branches:
995934
ignore:

fmriprep/workflows/bold/tests/test_util.py

Lines changed: 0 additions & 96 deletions
This file was deleted.

0 commit comments

Comments
 (0)