Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX: Warn for min/max_ver traits when tool version can't be parsed #3241

Merged
merged 4 commits into from
Aug 16, 2020
Merged

FIX: Warn for min/max_ver traits when tool version can't be parsed #3241

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44497f2
ENH: no more auto-failing on misparsed versions
TheChymera Aug 7, 2020
690c620
TEST: Validate bad version parse warning when hit with min/max version
effigies Aug 14, 2020
c56a3b1
STY: Reuse comparison, rewrite warning
effigies Aug 14, 2020
bf24dba
RF: Raise ValueError if stop_on_unknown_version is set
effigies Aug 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions nipype/interfaces/base/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,16 @@ def _check_version_requirements(self, trait_object, raise_exception=True):
version = LooseVersion(str(self.version))
for name in names:
min_ver = LooseVersion(str(trait_object.traits()[name].min_ver))
if min_ver > version:
try:
too_old = min_ver > version
except TypeError:
iflogger.warning(
f"Nipype cannot validate the package version {version!r} for "
f"{self.__class__.__name__}. Trait {name} requires version "
f">={min_ver}. Please verify validity."
)
continue
if too_old:
unavailable_traits.append(name)
if not isdefined(getattr(trait_object, name)):
continue
Expand All @@ -293,7 +302,16 @@ def _check_version_requirements(self, trait_object, raise_exception=True):
version = LooseVersion(str(self.version))
for name in names:
max_ver = LooseVersion(str(trait_object.traits()[name].max_ver))
if max_ver < version:
try:
too_new = max_ver < version
except TypeError:
iflogger.warning(
f"Nipype cannot validate the package version {version!r} for "
f"{self.__class__.__name__}. Trait {name} requires version "
f"<={max_ver}. Please verify validity."
)
continue
if too_new:
unavailable_traits.append(name)
if not isdefined(getattr(trait_object, name)):
continue
Expand Down
16 changes: 16 additions & 0 deletions nipype/interfaces/base/tests/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# vi: set ft=python sts=4 ts=4 sw=4 et:
import os
import simplejson as json
import logging

import pytest
from unittest import mock
Expand Down Expand Up @@ -236,6 +237,21 @@ class DerivedInterface1(nib.BaseInterface):
obj._check_version_requirements(obj.inputs)


def test_input_version_missing(caplog):
class DerivedInterface(nib.BaseInterface):
class input_spec(nib.TraitedSpec):
foo = nib.traits.Int(min_ver="0.9")
bar = nib.traits.Int(max_ver="0.9")
_version = "misparsed-garbage"

obj = DerivedInterface()
obj.inputs.foo = 1
obj.inputs.bar = 1
with caplog.at_level(logging.WARNING, logger="nipype.interface"):
obj._check_version_requirements(obj.inputs)
assert len(caplog.records) == 2


def test_output_version():
class InputSpec(nib.TraitedSpec):
foo = nib.traits.Int(desc="a random int")
Expand Down