Skip to content

Commit 6800cce

Browse files
committed
Removing code to raise exceptions for version control and switch to warning/add function
1 parent 33ebab8 commit 6800cce

File tree

1 file changed

+22
-8
lines changed

1 file changed

+22
-8
lines changed

nipype/interfaces/niftyreg/base.py

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,33 @@ class NiftyRegCommand(CommandLine):
7272

7373
def __init__(self, required_version=None, **inputs):
7474
super(NiftyRegCommand, self).__init__(**inputs)
75-
cur_version = self.get_version()
76-
if not cur_version:
75+
self.required_version = required_version
76+
_version = self.get_version()
77+
if _version:
78+
_version = _version.decode("utf-8")
79+
if StrictVersion(_version) < StrictVersion(self._min_version):
80+
warn = 'A later version of Niftyreg is required (%s < %s)'
81+
print(warn % (_version, self._min_version))
82+
if required_version is not None:
83+
if StrictVersion(_version) != StrictVersion(required_version):
84+
warn = 'The version of NiftyReg differs from the required'
85+
warn += '(%s != %s)'
86+
print(warn % (_version, required_version))
87+
88+
def check_version(self):
89+
_version = self.get_version()
90+
if not _version:
7791
raise Exception('Niftyreg not found')
7892
# Decoding to string:
79-
cur_version = cur_version.decode("utf-8")
80-
if StrictVersion(cur_version) < StrictVersion(self._min_version):
93+
_version = _version.decode("utf-8")
94+
if StrictVersion(_version) < StrictVersion(self._min_version):
8195
err = 'A later version of Niftyreg is required (%s < %s)'
82-
raise ValueError(err % (cur_version, self._min_version))
83-
if required_version is not None:
84-
if StrictVersion(cur_version) != StrictVersion(required_version):
96+
raise ValueError(err % (_version, self._min_version))
97+
if self.required_version:
98+
if StrictVersion(_version) != StrictVersion(self.required_version):
8599
err = 'The version of NiftyReg differs from the required'
86100
err += '(%s != %s)'
87-
raise ValueError(err % (cur_version, required_version))
101+
raise ValueError(err % (_version, self.required_version))
88102

89103
def get_version(self):
90104
if no_niftyreg(cmd=self.cmd):

0 commit comments

Comments
 (0)