Skip to content

Commit b059539

Browse files
committed
configure location of the test data with env
1 parent ef42d94 commit b059539

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

circle.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ test:
3232
environment:
3333
SPMMCRCMD: "$HOME/spm12/run_spm12.sh $HOME/mcr/v85/ script"
3434
FORCE_SPMMCR: 1
35+
FSL_COURSE_DATA: "$HOME/examples/fsl_course_data"
3536
timeout: 1600
3637
- set -o pipefail && cd doc && make html 2>&1 | tee ~/log.txt
3738
- cat ~/log.txt && if grep -q "ERROR" ~/log.txt; then false; else true; fi

nipype/interfaces/fsl/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,4 +263,4 @@ def no_fsl():
263263

264264
def no_fsl_course_data():
265265
"""check if fsl_course data is present"""
266-
return not (os.path.isdir(os.path.abspath('fsl_course_data')))
266+
return not ('FSL_COURSE_DATA' in os.environ and os.path.isdir(os.path.abspath(os.environ['FSL_COURSE_DATA'])))

nipype/workflows/dmri/fsl/tests/test_dti.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
@skipif(no_fsl)
1717
@skipif(no_fsl_course_data)
1818
def test_create_bedpostx_pipeline():
19-
fsl_course_dir = os.path.abspath('fsl_course_data')
19+
fsl_course_dir = os.path.abspath(os.environ['FSL_COURSE_DATA'])
2020

2121
mask_file = os.path.join(fsl_course_dir, "fdt/subj1.bedpostX/nodif_brain_mask.nii.gz")
2222
bvecs_file = os.path.join(fsl_course_dir, "fdt/subj1/bvecs")

nipype/workflows/dmri/fsl/tests/test_epi.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
from nipype.workflows.dmri.fsl.epi import create_eddy_correct_pipeline
1414

1515

16-
#@skipif(no_fsl)
17-
#@skipif(no_fsl_course_data)
16+
@skipif(no_fsl)
17+
@skipif(no_fsl_course_data)
1818
def test_create_eddy_correct_pipeline():
19-
fsl_course_dir = os.path.abspath('fsl_course_data')
19+
fsl_course_dir = os.path.abspath(os.environ['FSL_COURSE_DATA'])
2020

2121
dwi_file = os.path.join(fsl_course_dir, "fdt/subj1/data.nii.gz")
2222

nipype/workflows/dmri/fsl/tests/test_tbss.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616

1717
def _tbss_test_helper(estimate_skeleton):
18-
fsl_course_dir = os.path.abspath('fsl_course_data')
18+
fsl_course_dir = os.path.abspath(os.environ['FSL_COURSE_DATA'])
1919
fsl.FSLCommand.set_default_output_type('NIFTI_GZ')
2020
test_dir = tempfile.mkdtemp(prefix="nipype_test_tbss_")
2121
tbss_orig_dir = os.path.join(test_dir, "tbss_all_original")
@@ -121,13 +121,13 @@ def _tbss_test_helper(estimate_skeleton):
121121
shutil.rmtree(test_dir)
122122

123123

124-
@skipif(no_fsl)
124+
#@skipif(no_fsl)
125125
@skipif(no_fsl_course_data)
126126
def test_tbss_est_skeleton():
127127
_tbss_test_helper(True)
128128

129129

130-
@skipif(no_fsl)
130+
#@skipif(no_fsl)
131131
@skipif(no_fsl_course_data)
132132
def test_tbss_est_skeleton_use_precomputed_skeleton():
133133
_tbss_test_helper(False)

0 commit comments

Comments
 (0)