Skip to content

Commit 57bd5fe

Browse files
committed
fix: cleaner version checking
1 parent 705a13d commit 57bd5fe

File tree

1 file changed

+5
-18
lines changed

1 file changed

+5
-18
lines changed

nipype/interfaces/fsl/model.py

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,6 @@
3131
BaseInterfaceInputSpec)
3232
from .base import FSLCommand, FSLCommandInputSpec, Info
3333

34-
FSVersion = "0"
35-
_ver = Info.version()
36-
if _ver:
37-
if 'dev' in _ver:
38-
FSVersion = _ver.rstrip().split('-')[-1] + '.dev'
39-
else:
40-
FSVersion = _ver.rstrip().split('-v')[-1]
41-
42-
4334
class Level1DesignInputSpec(BaseInterfaceInputSpec):
4435
interscan_interval = traits.Float(mandatory=True,
4536
desc='Interscan interval (in secs)')
@@ -703,18 +694,15 @@ class FILMGLS(FSLCommand):
703694
"""
704695

705696
_cmd = 'film_gls'
706-
697+
input_spec = FILMGLSInputSpec
698+
output_spec = FILMGLSOutputSpec
707699
if Info.version() and LooseVersion(Info.version()) > LooseVersion('5.0.6'):
708700
input_spec = FILMGLSInputSpec507
701+
output_spec = FILMGLSOutputSpec507
709702
elif (Info.version() and
710703
LooseVersion(Info.version()) > LooseVersion('5.0.4')):
711704
input_spec = FILMGLSInputSpec505
712-
else:
713-
input_spec = FILMGLSInputSpec
714-
if Info.version() and LooseVersion(Info.version()) > LooseVersion('5.0.6'):
715-
output_spec = FILMGLSOutputSpec507
716-
else:
717-
output_spec = FILMGLSOutputSpec
705+
718706

719707
def _get_pe_files(self, cwd):
720708
files = None
@@ -1087,8 +1075,7 @@ class ContrastMgr(FSLCommand):
10871075
same location. This has deprecated for FSL versions 5.0.7+ as the necessary
10881076
corrections file is no longer generated by FILMGLS.
10891077
"""
1090-
1091-
if LooseVersion(FSVersion) >= LooseVersion("5.0.7"):
1078+
if Info.version() and LooseVersion(Info.version()) >= LooseVersion("5.0.7"):
10921079
warn("ContrastMgr is deprecated in FSL 5.0.7+", DeprecationWarning)
10931080
_cmd = 'contrast_mgr'
10941081
input_spec = ContrastMgrInputSpec

0 commit comments

Comments
 (0)