From 4a06c7d44ed93d5ca53a6d3324ed3acaf4314a36 Mon Sep 17 00:00:00 2001 From: Horea Christian Date: Fri, 7 Aug 2020 01:09:58 -0400 Subject: [PATCH] sci-libs/nipype: patching out autofail on misparsed version check Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Horea Christian --- sci-libs/nipype/ChangeLog | 4 ++++ .../files/nipype-1.5.0-version_check.patch | 18 ++++++++++++++++++ sci-libs/nipype/nipype-1.5.0.ebuild | 4 ++++ 3 files changed, 26 insertions(+) create mode 100644 sci-libs/nipype/files/nipype-1.5.0-version_check.patch diff --git a/sci-libs/nipype/ChangeLog b/sci-libs/nipype/ChangeLog index d5096df..5a5bd86 100644 --- a/sci-libs/nipype/ChangeLog +++ b/sci-libs/nipype/ChangeLog @@ -1,3 +1,7 @@ + 07 Aug 2020; +files/nipype-1.5.0-version_check.patch, + nipype-1.5.0.ebuild: + sci-libs/nipype: patching out autofail on misparsed version check + 27 Jul 2020; +files/98nipype, nipype-1.5.0.ebuild: sci-libs/nipype: disabled etelemetry functionality 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 0000000..a5b7793 --- /dev/null +++ b/sci-libs/nipype/files/nipype-1.5.0-version_check.patch @@ -0,0 +1,18 @@ +--- a/nipype/interfaces/base/core.py 2020-08-06 02:07:56.750154463 -0400 ++++ b/nipype/interfaces/base/core.py 2020-08-07 00:56:11.748074237 -0400 +@@ -276,6 +276,15 @@ + 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 ' ++ 'for Trait {} ({})' ++ 'You may want to check whehter {} is larger than {}' ++ .format(name, self.__class__.__name__, version, min_ver) ++ ) + if min_ver > version: + unavailable_traits.append(name) + if not isdefined(getattr(trait_object, name)): diff --git a/sci-libs/nipype/nipype-1.5.0.ebuild b/sci-libs/nipype/nipype-1.5.0.ebuild index 5454205..0df7333 100644 --- a/sci-libs/nipype/nipype-1.5.0.ebuild +++ b/sci-libs/nipype/nipype-1.5.0.ebuild @@ -44,6 +44,10 @@ RDEPEND=" sci-libs/scipy[${PYTHON_USEDEP}] " +PATCHES=( + "${FILESDIR}/${P}"-version_check.patch +) + src_prepare() { # Remove etelemetry sed -i '/"etelemetry/d' nipype/info.py || die