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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B2B5D158042 for ; Thu, 31 Oct 2024 19:19:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 09050E088A; Thu, 31 Oct 2024 19:19:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id E9970E088A for ; Thu, 31 Oct 2024 19:19:35 +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 34BA53430DD for ; Thu, 31 Oct 2024 19:19:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9161B1A44 for ; Thu, 31 Oct 2024 19:19:33 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1730402369.22242611fbd98c3f48b1a78bbac102dd8e310c10.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/numpy/files/numpy-2.0.2-setuptools-74.patch dev-python/numpy/numpy-2.0.2-r1.ebuild dev-python/numpy/numpy-2.0.2.ebuild X-VCS-Directories: dev-python/numpy/files/ dev-python/numpy/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 22242611fbd98c3f48b1a78bbac102dd8e310c10 X-VCS-Branch: master Date: Thu, 31 Oct 2024 19:19:33 +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: 0d5a6cf3-60fc-4f0e-9eb5-32eb985f5f7a X-Archives-Hash: 00557e3882abf0270776cf8209409006 commit: 22242611fbd98c3f48b1a78bbac102dd8e310c10 Author: Michał Górny gentoo org> AuthorDate: Thu Oct 31 19:09:41 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Oct 31 19:19:29 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22242611 dev-python/numpy: Backport setuptools-74 fixes to 2.0.2-r1 Signed-off-by: Michał Górny gentoo.org> .../numpy/files/numpy-2.0.2-setuptools-74.patch | 29 ++++++++++++++++++++++ .../{numpy-2.0.2.ebuild => numpy-2.0.2-r1.ebuild} | 12 +++++++++ 2 files changed, 41 insertions(+) diff --git a/dev-python/numpy/files/numpy-2.0.2-setuptools-74.patch b/dev-python/numpy/files/numpy-2.0.2-setuptools-74.patch new file mode 100644 index 000000000000..7e61378bdecc --- /dev/null +++ b/dev-python/numpy/files/numpy-2.0.2-setuptools-74.patch @@ -0,0 +1,29 @@ +From 1cc02cc6710384c52e1082a33d1617504eaed296 Mon Sep 17 00:00:00 2001 +From: Katie Rust +Date: Mon, 16 Sep 2024 13:04:22 -0500 +Subject: [PATCH] BUG: Stub out `get_build_msvc_version` if + `distutils.msvccompiler` cannot be imported (fixes #27405) + +--- + numpy/distutils/mingw32ccompiler.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py +index 39905a784088..2599a9e9a807 100644 +--- a/numpy/distutils/mingw32ccompiler.py ++++ b/numpy/distutils/mingw32ccompiler.py +@@ -24,7 +24,13 @@ + + import distutils.cygwinccompiler + from distutils.unixccompiler import UnixCCompiler +-from distutils.msvccompiler import get_build_version as get_build_msvc_version ++ ++try: ++ from distutils.msvccompiler import get_build_version as get_build_msvc_version ++except ImportError: ++ def get_build_msvc_version(): ++ return None ++ + from distutils.errors import UnknownFileError + from numpy.distutils.misc_util import (msvc_runtime_library, + msvc_runtime_version, diff --git a/dev-python/numpy/numpy-2.0.2.ebuild b/dev-python/numpy/numpy-2.0.2-r1.ebuild similarity index 92% rename from dev-python/numpy/numpy-2.0.2.ebuild rename to dev-python/numpy/numpy-2.0.2-r1.ebuild index 36b49c01956b..b2f86a093db9 100644 --- a/dev-python/numpy/numpy-2.0.2.ebuild +++ b/dev-python/numpy/numpy-2.0.2-r1.ebuild @@ -57,6 +57,11 @@ EPYTEST_XDIST=1 distutils_enable_tests pytest python_prepare_all() { + local PATCHES=( + # https://github.com/numpy/numpy/pull/27406 + "${FILESDIR}/${P}-setuptools-74.patch" + ) + # bug #922457 filter-lto # https://github.com/numpy/numpy/issues/25004 @@ -119,6 +124,13 @@ python_test() { ;; esac + if has_version ">=dev-python/setuptools-74[${PYTHON_USEDEP}]"; then + # msvccompiler removal + EPYTEST_DESELECT+=( + tests/test_public_api.py::test_api_importable + ) + fi + if ! has_version -b "~${CATEGORY}/${P}[${PYTHON_USEDEP}]" ; then # depends on importing numpy.random from system namespace EPYTEST_DESELECT+=(