diff options
| author |   Horea Christian <chr@chymera.eu> | 2020-09-25 05:26:39 -0400 |
|---|---|---|
| committer | Horea Christian <chr@chymera.eu> | 2020-09-25 05:26:39 -0400 |
| commit | 7766d151243230173d21865e85dbf7c71853f8ad (patch) | |
| tree | e55c588908ecd9aa46b90149001eb0bdc948fd53 /sci-libs/nipype/files | |
| parent | sci-libs/nibabel: removed old version, PYTHON_COMPAT update (diff) | |
| download | sci-7766d151243230173d21865e85dbf7c71853f8ad.tar.gz sci-7766d151243230173d21865e85dbf7c71853f8ad.tar.bz2 sci-7766d151243230173d21865e85dbf7c71853f8ad.zip | |
sci-libs/nipype: version bump 1.{4,5}* and old version removal
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Horea Christian <chr@chymera.eu>
Diffstat (limited to 'sci-libs/nipype/files')
| -rw-r--r-- | sci-libs/nipype/files/98nipype | 1 | ||||
| -rw-r--r-- | sci-libs/nipype/files/nipype-1.5.0-version_check.patch | 45 |
2 files changed, 46 insertions, 0 deletions
diff --git a/sci-libs/nipype/files/98nipype b/sci-libs/nipype/files/98nipype new file mode 100644 index 000000000..c848f7c2a --- /dev/null +++ b/sci-libs/nipype/files/98nipype @@ -0,0 +1 @@ +export NIPYPE_NO_ET=1 diff --git a/sci-libs/nipype/files/nipype-1.5.0-version_check.patch b/sci-libs/nipype/files/nipype-1.5.0-version_check.patch new file mode 100644 index 000000000..8b7f11c63 --- /dev/null +++ b/sci-libs/nipype/files/nipype-1.5.0-version_check.patch @@ -0,0 +1,45 @@ +From b4d57d7ca4359b0990636bbc6091c49706c6ff39 Mon Sep 17 00:00:00 2001 +From: Horea Christian <chr@chymera.eu> +Date: Fri, 7 Aug 2020 01:12:38 -0400 +Subject: [PATCH] ENH: no more auto-failing on misparsed versions + +--- + nipype/interfaces/base/core.py | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/nipype/interfaces/base/core.py b/nipype/interfaces/base/core.py +index 82da393a84..1e626fe1b5 100644 +--- a/nipype/interfaces/base/core.py ++++ b/nipype/interfaces/base/core.py +@@ -276,6 +276,15 @@ 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)) ++ try: ++ min_ver > version ++ except TypeError: ++ iflogger.warning( ++ 'Nipype is having issues parsing the package version ' ++ f'for Trait {name} ({self.__class__.__name__})' ++ f'You may want to check whether {version} is larger than {min_ver}' ++ ) ++ continue + if min_ver > version: + unavailable_traits.append(name) + if not isdefined(getattr(trait_object, name)): +@@ -293,6 +302,15 @@ 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)) ++ try: ++ max_ver > version ++ except TypeError: ++ iflogger.warning( ++ 'Nipype is having issues parsing the package version ' ++ f'for Trait {name} ({self.__class__.__name__})' ++ f'You may want to check whether {version} is smaller than {max_ver}' ++ ) ++ continue + if max_ver < version: + unavailable_traits.append(name) + if not isdefined(getattr(trait_object, name)): |