Skip to content

Commit f2814de

Browse files
committed
check that xor is not a single string in code generation
1 parent 3144f50 commit f2814de

File tree

3 files changed

+29
-1
lines changed

3 files changed

+29
-1
lines changed

nipype2pydra/interface/shell.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,16 @@ def generate_code(self, input_fields, nonstd_types, output_fields) -> str:
106106
else:
107107
name, _, __, mdata = inpt
108108
if "xor" in mdata:
109-
xor_sets.add(frozenset(list(mdata["xor"]) + [name]))
109+
xor_sets.add(
110+
frozenset(
111+
list(
112+
mdata["xor"]
113+
if not isinstance(mdata["xor"], str)
114+
else [mdata["xor"]]
115+
)
116+
+ [name]
117+
)
118+
)
110119
pos = mdata.get("position", None)
111120
if isinstance(pos, str):
112121
# convert string reprs (I think a mistake) to ints

nipype2pydra/interface/tests/test_interface.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,25 +34,33 @@
3434
"fsl-interfaces-tract_skeleton",
3535
"fsl-interfaces-smooth_estimate",
3636
"fsl-interfaces-apply_xfm",
37+
"fsl-interfaces-cleaner",
38+
"fsl-interfaces-complex",
3739
"fsl-interfaces-dual_regression",
3840
"fsl-interfaces-eddy",
3941
"fsl-interfaces-split",
4042
"freesurfer-interfaces-logan",
43+
"freesurfer-interfaces-label_2_vol",
4144
"freesurfer-interfaces-mrtm1",
4245
"freesurfer-interfaces-mrtm2",
46+
"freesurfer-interfaces-surface_snapshots",
47+
"freesurfer-interfaces-tkregister_2",
4348
"freesurfer-interfaces-concatenate_lta",
4449
"freesurfer-interfaces-one_sample_t_test",
4550
"freesurfer-interfaces-concatenate",
4651
"freesurfer-interfaces-mris_preproc_recon_all",
4752
"freesurfer-interfaces-recon_all",
4853
"freesurfer-interfaces-glm_fit",
4954
"freesurfer-interfaces-mri_convert",
55+
"freesurfer-interfaces-make_surfaces",
5056
"freesurfer-interfaces-parcellation_stats",
5157
"freesurfer-interfaces-mp_rto_mni305",
5258
"afni-interfaces-qwarp_plus_minus",
5359
"afni-interfaces-qwarp",
5460
"afni-interfaces-align_epi_anat_py",
5561
"afni-interfaces-fwh_mx",
62+
"afni-interfaces-nwarp_adjust",
63+
"afni-interfaces-clip_level",
5664
]
5765

5866
XFAIL_INTERFACES_IN_COMBINED = [

required-fileformats/freesurfer/fileformats/medimage_freesurfer/__init__.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from fileformats.generic import File
22

3+
34
class M3z(File):
45
ext = ".m3z"
56
binary = True
@@ -83,3 +84,13 @@ class Reg(File):
8384
class Avg_curv(File):
8485
ext = ".avg_curv"
8586
binary = True
87+
88+
89+
class Label(File):
90+
ext = ".label"
91+
binary = True
92+
93+
94+
class Dat(File):
95+
ext = ".dat"
96+
binary = True

0 commit comments

Comments
 (0)