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 653A2158004 for ; Mon, 11 Dec 2023 16:00:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 774E02BC02D; Mon, 11 Dec 2023 16:00:00 +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 52D612BC02D for ; Mon, 11 Dec 2023 16:00:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 smtp.gentoo.org (Postfix) with ESMTPS id D88A0335D6B for ; Mon, 11 Dec 2023 15:59:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 445A7929 for ; Mon, 11 Dec 2023 15:59:57 +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: <1702310370.1d9f52f78d06e93d2fa28efaff395e19c17f063a.chymera@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/nipype/, sci-libs/nipype/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/nipype/files/nipype-1.8.4-no_etelemetry.patch sci-libs/nipype/nipype-1.8.4-r1.ebuild sci-libs/nipype/nipype-1.8.4-r2.ebuild X-VCS-Directories: sci-libs/nipype/ sci-libs/nipype/files/ X-VCS-Committer: chymera X-VCS-Committer-Name: Horea Christian X-VCS-Revision: 1d9f52f78d06e93d2fa28efaff395e19c17f063a X-VCS-Branch: master Date: Mon, 11 Dec 2023 15:59:57 +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: b2d2bc18-344b-423b-a0fd-eea91fd34aea X-Archives-Hash: 3840677db973f2eb1820679d7823df1f commit: 1d9f52f78d06e93d2fa28efaff395e19c17f063a Author: Horea Christian chymera eu> AuthorDate: Mon Dec 11 15:59:30 2023 +0000 Commit: Horea Christian gmail com> CommitDate: Mon Dec 11 15:59:30 2023 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=1d9f52f7 sci-libs/nipype: PEP517 fixes and revbump Signed-off-by: Horea Christian chymera.eu> .../nipype/files/nipype-1.8.4-no_etelemetry.patch | 50 ++++++++++++++++++++++ sci-libs/nipype/nipype-1.8.4-r1.ebuild | 1 + ...pype-1.8.4-r1.ebuild => nipype-1.8.4-r2.ebuild} | 5 ++- 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/sci-libs/nipype/files/nipype-1.8.4-no_etelemetry.patch b/sci-libs/nipype/files/nipype-1.8.4-no_etelemetry.patch new file mode 100644 index 000000000..b5c223422 --- /dev/null +++ b/sci-libs/nipype/files/nipype-1.8.4-no_etelemetry.patch @@ -0,0 +1,50 @@ +diff --git a/nipype/__init__.py b/nipype/__init__.py +index 06084e823..2e42dcbce 100644 +--- a/nipype/__init__.py ++++ b/nipype/__init__.py +@@ -73,23 +73,6 @@ from .interfaces import ( + ) + + +-def check_latest_version(raise_exception=False): +- """ +- Check for the latest version of the library. +- +- Parameters +- ---------- +- raise_exception: bool +- Raise a RuntimeError if a bad version is being used +- """ +- import etelemetry +- +- logger = logging.getLogger("nipype.utils") +- return etelemetry.check_available_version( +- "nipy/nipype", __version__, logger, raise_exception +- ) +- +- + # Run telemetry on import for interactive sessions, such as IPython, Jupyter notebooks, Python REPL + if config.getboolean("execution", "check_version"): + import __main__ +@@ -98,4 +81,4 @@ if config.getboolean("execution", "check_version"): + from .interfaces.base import BaseInterface + + if BaseInterface._etelemetry_version_data is None: +- BaseInterface._etelemetry_version_data = check_latest_version() or "n/a" ++ BaseInterface._etelemetry_version_data = "n/a" +diff --git a/nipype/interfaces/base/core.py b/nipype/interfaces/base/core.py +index c8099be63..f7770dbfc 100644 +--- a/nipype/interfaces/base/core.py ++++ b/nipype/interfaces/base/core.py +@@ -183,10 +183,9 @@ class BaseInterface(Interface): + config.getboolean("execution", "check_version") + and "NIPYPE_NO_ET" not in os.environ + ): +- from ... import check_latest_version + + if BaseInterface._etelemetry_version_data is None: +- BaseInterface._etelemetry_version_data = check_latest_version() or "n/a" ++ BaseInterface._etelemetry_version_data = "n/a" + + if not self.input_spec: + raise Exception("No input_spec in class: %s" % self.__class__.__name__) diff --git a/sci-libs/nipype/nipype-1.8.4-r1.ebuild b/sci-libs/nipype/nipype-1.8.4-r1.ebuild index 8214ccff4..7c2e801ff 100644 --- a/sci-libs/nipype/nipype-1.8.4-r1.ebuild +++ b/sci-libs/nipype/nipype-1.8.4-r1.ebuild @@ -3,6 +3,7 @@ EAPI=8 +DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+),sqlite" diff --git a/sci-libs/nipype/nipype-1.8.4-r1.ebuild b/sci-libs/nipype/nipype-1.8.4-r2.ebuild similarity index 93% copy from sci-libs/nipype/nipype-1.8.4-r1.ebuild copy to sci-libs/nipype/nipype-1.8.4-r2.ebuild index 8214ccff4..4c3da70b3 100644 --- a/sci-libs/nipype/nipype-1.8.4-r1.ebuild +++ b/sci-libs/nipype/nipype-1.8.4-r2.ebuild @@ -3,6 +3,7 @@ EAPI=8 +DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+),sqlite" @@ -14,7 +15,7 @@ SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" IUSE="test" RESTRICT="!test? ( test )" @@ -45,10 +46,12 @@ RDEPEND=" PATCHES=( "${FILESDIR}/${PN}-1.8.4-dependency_compatibility.patch" + "${FILESDIR}/${PN}-1.8.4-no_etelemetry.patch" ) src_prepare() { # Remove etelemetry + # Doing this separately since the file is affected by another patch. sed -i '/"etelemetry/d' nipype/info.py requirements.txt || die # Mark failing tests