Skip to content

Commit edcf613

Browse files
committed
using tmpdir.join().strpath in tests with nibabel or other funcions that dont take path.local
1 parent 95a30a7 commit edcf613

File tree

5 files changed

+28
-35
lines changed

5 files changed

+28
-35
lines changed

nipype/algorithms/tests/test_errormap.py

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
def test_errormap(tmpdir):
1313

14-
tempdir = tmpdir.strpath
1514
# Single-Spectual
1615
# Make two fake 2*2*2 voxel volumes
1716
volume1 = np.array([[[2.0, 8.0], [1.0, 2.0]], [[1.0, 9.0], [0.0, 3.0]]]) # John von Neumann's birthday
@@ -22,15 +21,15 @@ def test_errormap(tmpdir):
2221
img2 = nb.Nifti1Image(volume2, np.eye(4))
2322
maskimg = nb.Nifti1Image(mask, np.eye(4))
2423

25-
nb.save(img1, os.path.join(tempdir, 'von.nii.gz'))
26-
nb.save(img2, os.path.join(tempdir, 'alan.nii.gz'))
27-
nb.save(maskimg, os.path.join(tempdir, 'mask.nii.gz'))
24+
nb.save(img1, tmpdir.join('von.nii.gz').strpath)
25+
nb.save(img2, tmpdir.join('alan.nii.gz').strpath)
26+
nb.save(maskimg, tmpdir.join('mask.nii.gz').strpath)
2827

2928
# Default metric
3029
errmap = ErrorMap()
31-
errmap.inputs.in_tst = os.path.join(tempdir, 'von.nii.gz')
32-
errmap.inputs.in_ref = os.path.join(tempdir, 'alan.nii.gz')
33-
errmap.out_map = os.path.join(tempdir, 'out_map.nii.gz')
30+
errmap.inputs.in_tst = tmpdir.join('von.nii.gz').strpath
31+
errmap.inputs.in_ref = tmpdir.join('alan.nii.gz').strpath
32+
errmap.out_map = tmpdir.join('out_map.nii.gz').strpath
3433
result = errmap.run()
3534
assert result.outputs.distance == 1.125
3635

@@ -45,7 +44,7 @@ def test_errormap(tmpdir):
4544
assert result.outputs.distance == 0.875
4645

4746
# Masked
48-
errmap.inputs.mask = os.path.join(tempdir, 'mask.nii.gz')
47+
errmap.inputs.mask = tmpdir.join('mask.nii.gz').strpath
4948
result = errmap.run()
5049
assert result.outputs.distance == 1.0
5150

@@ -62,11 +61,11 @@ def test_errormap(tmpdir):
6261
msvolume2[:, :, :, 1] = volume1
6362
msimg2 = nb.Nifti1Image(msvolume2, np.eye(4))
6463

65-
nb.save(msimg1, os.path.join(tempdir, 'von-ray.nii.gz'))
66-
nb.save(msimg2, os.path.join(tempdir, 'alan-ray.nii.gz'))
64+
nb.save(msimg1, tmpdir.join('von-ray.nii.gz').strpath)
65+
nb.save(msimg2, tmpdir.join('alan-ray.nii.gz').strpath)
6766

68-
errmap.inputs.in_tst = os.path.join(tempdir, 'von-ray.nii.gz')
69-
errmap.inputs.in_ref = os.path.join(tempdir, 'alan-ray.nii.gz')
67+
errmap.inputs.in_tst = tmpdir.join('von-ray.nii.gz').strpath
68+
errmap.inputs.in_ref = tmpdir.join('alan-ray.nii.gz').strpath
7069
errmap.inputs.metric = 'sqeuclidean'
7170
result = errmap.run()
7271
assert result.outputs.distance == 5.5

nipype/algorithms/tests/test_modelgen.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717

1818

1919
def test_modelgen1(tmpdir):
20-
tempdir = tmpdir.strpath
21-
filename1 = os.path.join(tempdir, 'test1.nii')
22-
filename2 = os.path.join(tempdir, 'test2.nii')
20+
filename1 = tmpdir.join('test1.nii').strpath
21+
filename2 = tmpdir.join('test2.nii').strpath
2322
Nifti1Image(np.random.rand(10, 10, 10, 200), np.eye(4)).to_filename(filename1)
2423
Nifti1Image(np.random.rand(10, 10, 10, 200), np.eye(4)).to_filename(filename2)
2524
s = SpecifyModel()
@@ -56,9 +55,8 @@ def test_modelgen1(tmpdir):
5655

5756

5857
def test_modelgen_spm_concat(tmpdir):
59-
tempdir = tmpdir.strpath
60-
filename1 = os.path.join(tempdir, 'test1.nii')
61-
filename2 = os.path.join(tempdir, 'test2.nii')
58+
filename1 = tmpdir.join('test1.nii').strpath
59+
filename2 = tmpdir.join('test2.nii').strpath
6260
Nifti1Image(np.random.rand(10, 10, 10, 30), np.eye(4)).to_filename(filename1)
6361
Nifti1Image(np.random.rand(10, 10, 10, 30), np.eye(4)).to_filename(filename2)
6462

@@ -97,7 +95,7 @@ def test_modelgen_spm_concat(tmpdir):
9795
npt.assert_almost_equal(np.array(res.outputs.session_info[0]['cond'][0]['onset']), np.array([2.0, 50.0, 100.0, 170.0]))
9896

9997
# Test case for variable number of events in separate runs, sometimes unique.
100-
filename3 = os.path.join(tempdir, 'test3.nii')
98+
filename3 = tmpdir.join('test3.nii').strpath
10199
Nifti1Image(np.random.rand(10, 10, 10, 30), np.eye(4)).to_filename(filename3)
102100
s.inputs.functional_runs = [filename1, filename2, filename3]
103101
info = [Bunch(conditions=['cond1', 'cond2'], onsets=[[2, 3], [2]], durations=[[1, 1], [1]]),
@@ -122,9 +120,8 @@ def test_modelgen_spm_concat(tmpdir):
122120

123121

124122
def test_modelgen_sparse(tmpdir):
125-
tempdir = tmpdir.strpath
126-
filename1 = os.path.join(tempdir, 'test1.nii')
127-
filename2 = os.path.join(tempdir, 'test2.nii')
123+
filename1 = tmpdir.join('test1.nii').strpath
124+
filename2 = tmpdir.join('test2.nii').strpath
128125
Nifti1Image(np.random.rand(10, 10, 10, 50), np.eye(4)).to_filename(filename1)
129126
Nifti1Image(np.random.rand(10, 10, 10, 50), np.eye(4)).to_filename(filename2)
130127
s = SpecifySparseModel()

nipype/algorithms/tests/test_normalize_tpms.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919

2020
def test_normalize_tpms(tmpdir):
21-
tempdir = tmpdir.strpath
2221

2322
in_mask = example_data('tpms_msk.nii.gz')
2423
mskdata = nb.load(in_mask, mmap=NUMPY_MMAP).get_data()
@@ -30,8 +29,8 @@ def test_normalize_tpms(tmpdir):
3029

3130
for i in range(3):
3231
mapname = example_data('tpm_%02d.nii.gz' % i)
33-
filename = os.path.join(tempdir, 'modtpm_%02d.nii.gz' % i)
34-
out_files.append(os.path.join(tempdir, 'normtpm_%02d.nii.gz' % i))
32+
filename = tmpdir.join('modtpm_%02d.nii.gz' % i).strpath
33+
out_files.append(tmpdir.join('normtpm_%02d.nii.gz' % i).strpath)
3534

3635
im = nb.load(mapname, mmap=NUMPY_MMAP)
3736
data = im.get_data()

nipype/interfaces/freesurfer/tests/test_model.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
def test_concatenate(tmpdir):
1818
tmpdir.chdir()
1919

20-
tempdir = tmpdir.strpath
21-
in1 = os.path.join(tempdir, 'cont1.nii')
22-
in2 = os.path.join(tempdir, 'cont2.nii')
20+
in1 = tmpdir.join('cont1.nii').strpath
21+
in2 = tmpdir.join('cont2.nii').strpath
2322
out = 'bar.nii'
2423

2524
data1 = np.zeros((3, 3, 3, 1), dtype=np.float32)
@@ -32,12 +31,12 @@ def test_concatenate(tmpdir):
3231

3332
# Test default behavior
3433
res = model.Concatenate(in_files=[in1, in2]).run()
35-
assert res.outputs.concatenated_file == os.path.join(tempdir, 'concat_output.nii.gz')
34+
assert res.outputs.concatenated_file == tmpdir.join('concat_output.nii.gz').strpath
3635
assert np.allclose(nb.load('concat_output.nii.gz').get_data(), out_data)
3736

3837
# Test specified concatenated_file
3938
res = model.Concatenate(in_files=[in1, in2], concatenated_file=out).run()
40-
assert res.outputs.concatenated_file == os.path.join(tempdir, out)
39+
assert res.outputs.concatenated_file == tmpdir.join(out).strpath
4140
assert np.allclose(nb.load(out, mmap=NUMPY_MMAP).get_data(), out_data)
4241

4342
# Test in workflow
@@ -47,9 +46,9 @@ def test_concatenate(tmpdir):
4746
name='concat')
4847
wf.add_nodes([concat])
4948
wf.run()
50-
assert np.allclose(nb.load(os.path.join(tempdir,
51-
'test_concatenate',
52-
'concat', out)).get_data(),
49+
assert np.allclose(nb.load(tmpdir.join(
50+
'test_concatenate',
51+
'concat', out).strpath).get_data(),
5352
out_data)
5453

5554
# Test a simple statistic

nipype/utils/tests/test_provenance.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ def test_provenance():
2121
assert 'echo hello' in provn
2222

2323
def test_provenance_exists(tmpdir):
24-
tempdir = tmpdir.strpath
2524
tmpdir.chdir()
2625
from nipype import config
2726
from nipype.interfaces.base import CommandLine
@@ -31,7 +30,7 @@ def test_provenance_exists(tmpdir):
3130
CommandLine('echo hello').run()
3231
config.set('execution', 'write_provenance', provenance_state)
3332
config.set('execution', 'hash_method', hash_state)
34-
provenance_exists = os.path.exists(os.path.join(tempdir, 'provenance.provn'))
33+
provenance_exists = os.path.exists(tmpdir.join('provenance.provn').strpath)
3534
assert provenance_exists
3635

3736
def test_safe_encode():

0 commit comments

Comments
 (0)