diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2024-11-01 07:21:26 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2024-11-01 07:21:26 +0000 |
| commit | e8613737f8488d500058cc8c5e7ad45a96ad2a0a (patch) | |
| tree | 864bbd6ac42dad2589dbd46239e38b4a82e4e0af /dev-python/numpy | |
| parent | a796170fd911c9b466cbcb63efaa4f9cf59da488 (diff) | |
| download | baldeagleos-repo-e8613737f8488d500058cc8c5e7ad45a96ad2a0a.tar.gz baldeagleos-repo-e8613737f8488d500058cc8c5e7ad45a96ad2a0a.tar.xz baldeagleos-repo-e8613737f8488d500058cc8c5e7ad45a96ad2a0a.zip | |
Adding metadata
Diffstat (limited to 'dev-python/numpy')
| -rw-r--r-- | dev-python/numpy/files/numpy-2.0.2-setuptools-74.patch | 29 | ||||
| -rw-r--r-- | dev-python/numpy/numpy-2.0.2-r1.ebuild (renamed from dev-python/numpy/numpy-2.0.2.ebuild) | 12 |
2 files changed, 41 insertions, 0 deletions
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 <katie@ktpanda.org> +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 index 3eaf99560a3c..89b62e871bb8 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+=( |