From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BE0CD158094 for ; Mon, 11 Jul 2022 18:32:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF9EBE0FE9; Mon, 11 Jul 2022 18:32:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B5F89E0FE9 for ; Mon, 11 Jul 2022 18:32:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B1046340CC4 for ; Mon, 11 Jul 2022 18:32:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1659B1E for ; Mon, 11 Jul 2022 18:32:24 +0000 (UTC) From: "Horea Christian" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Horea Christian" Message-ID: <1657564337.0c07f1c2cc4caec9042ea446d13ed857139f8caf.chymera@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/nipype/files/, sci-libs/nipype/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/nipype/files/nipype-1.5.0-collections.patch sci-libs/nipype/nipype-1.5.0.ebuild X-VCS-Directories: sci-libs/nipype/files/ sci-libs/nipype/ X-VCS-Committer: chymera X-VCS-Committer-Name: Horea Christian X-VCS-Revision: 0c07f1c2cc4caec9042ea446d13ed857139f8caf X-VCS-Branch: master Date: Mon, 11 Jul 2022 18:32:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b918487a-8dd7-477b-9dfc-f1632055a000 X-Archives-Hash: cf6e94363c4f27847c12f888b8174cc6 commit: 0c07f1c2cc4caec9042ea446d13ed857139f8caf Author: Horea Christian chymera eu> AuthorDate: Mon Jul 11 18:32:17 2022 +0000 Commit: Horea Christian gmail com> CommitDate: Mon Jul 11 18:32:17 2022 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=0c07f1c2 sci-libs/nipype: EAPI and PYTHON_COMPAT bump, test fix Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Horea Christian chymera.eu> .../nipype/files/nipype-1.5.0-collections.patch | 28 ++++++++++++++++++++++ sci-libs/nipype/nipype-1.5.0.ebuild | 17 +++++++++---- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/sci-libs/nipype/files/nipype-1.5.0-collections.patch b/sci-libs/nipype/files/nipype-1.5.0-collections.patch new file mode 100644 index 000000000..e784ba48b --- /dev/null +++ b/sci-libs/nipype/files/nipype-1.5.0-collections.patch @@ -0,0 +1,28 @@ +--- a/nipype/interfaces/base/traits_extension.py 2020-06-03 11:08:30.000000000 -0400 ++++ b/nipype/interfaces/base/traits_extension.py 2022-07-11 14:09:31.847784312 -0400 +@@ -19,7 +19,10 @@ + (usually by Robert Kern). + + """ +-from collections import Sequence ++try: ++ from collections import Sequence ++except ImportError: ++ from collections.abc import Sequence + + # perform all external trait imports here + from traits import __version__ as traits_version +--- a/nipype/utils/misc.py 2020-06-03 11:08:30.000000000 -0400 ++++ b/nipype/utils/misc.py 2020-06-03 14:08:57.951408897 -0400 +@@ -6,7 +6,10 @@ + import os + import sys + import re +-from collections import Iterator ++try: ++ from collections import Iterator ++except ImportError: ++ from collections.abc import Iterator + from warnings import warn + + from distutils.version import LooseVersion diff --git a/sci-libs/nipype/nipype-1.5.0.ebuild b/sci-libs/nipype/nipype-1.5.0.ebuild index 35792adbc..67e244049 100644 --- a/sci-libs/nipype/nipype-1.5.0.ebuild +++ b/sci-libs/nipype/nipype-1.5.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="threads(+),sqlite" inherit distutils-r1 @@ -47,6 +47,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}/${P}"-version_check.patch + "${FILESDIR}/${P}"-collections.patch ) src_prepare() { @@ -68,10 +69,18 @@ python_install_all() { doenvd "${FILESDIR}/98nipype" } +EPYTEST_DESELECT=( + nipype/algorithms/tests/test_CompCor.py::TestCompCor::test_compcor + nipype/algorithms/tests/test_CompCor.py::TestCompCor::test_compcor_variance_threshold_and_metadata + nipype/algorithms/tests/test_CompCor.py::TestCompCor::test_tcompcor + nipype/interfaces/tests/test_io.py::test_s3datagrabber_communication + nipype/utils/tests/test_cmd.py::TestNipypeCMD::test_main_returns_0_on_help +) + python_test() { # Setting environment variable to disable etelemetry version check: # https://github.com/nipy/nipype/issues/3196#issuecomment-605980044 - NIPYPE_NO_ET=1 pytest -vv\ + NIPYPE_NO_ET=1 epytest -vv\ || die # Upstream test configuration fails #-c nipype/pytest.ini\