From 61dfa1cf3d5553d689b73eddff8c23e876094bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 7 Apr 2026 14:16:08 +0200 Subject: [PATCH] dev-python/scikit-build: Remove old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/scikit-build/Manifest | 1 - .../scikit-build-0.18.1-setuptools-75.patch | 42 ----------- .../scikit-build/scikit-build-0.18.1.ebuild | 71 ------------------- 3 files changed, 114 deletions(-) delete mode 100644 dev-python/scikit-build/files/scikit-build-0.18.1-setuptools-75.patch delete mode 100644 dev-python/scikit-build/scikit-build-0.18.1.ebuild diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest index b2039d8f50b8d..38ef329380fc5 100644 --- a/dev-python/scikit-build/Manifest +++ b/dev-python/scikit-build/Manifest @@ -1,3 +1,2 @@ -DIST scikit_build-0.18.1.tar.gz 274171 BLAKE2B af82af368f883450c98670e26c414181ab60ef04615986843967f537e206e6c64901c9eace8f12af12f067178cad14886d853d230200463b00452f7ec550436f SHA512 872f4bc4c313459842b537ded5503799da5b5e02a8e403eb3095edd719ea7be32942ce4e9c7cd55a4f78c2f032627f7398e99db6be19b711c8e1d906264dba48 DIST scikit_build-0.19.0.tar.gz 274552 BLAKE2B 961436b23d39ea5c6b7f8258da3a10b03e265155ef4e312a69dc7a423dc8cb2ce837f547dbaeaf8902e36ab04736f71ef4e092fb8b6bdca2c601f9728aa777e1 SHA512 3201789ae996603ded40fc997d3df712b440e7242d8ed04f027aa05ac66788c19725a7736e4296429095464024f1b06e6258fc5c7b31879496264bf56e2df51b DIST scikit_build-0.19.0.tar.gz.provenance 9674 BLAKE2B 328eac64356a2e06650c15e3314985401a7d24fcd502f9bd6855c70664d0b3096ffd2e5be25aec14cfc18558f647b1940491dd3626363d3d347d20c347fee7eb SHA512 748553c323cb4d44128497c4c460072e63c86082e7e33d2655ad9348aa0fc4d7a34aba1ef243279f0ff68900cd5133ca8441e75b12351e9a4d27279bcc79aeda diff --git a/dev-python/scikit-build/files/scikit-build-0.18.1-setuptools-75.patch b/dev-python/scikit-build/files/scikit-build-0.18.1-setuptools-75.patch deleted file mode 100644 index 033b98fd2c58f..0000000000000 --- a/dev-python/scikit-build/files/scikit-build-0.18.1-setuptools-75.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3992485c67331097553ec8f54233c4c295943f70 Mon Sep 17 00:00:00 2001 -From: Henry Schreiner -Date: Mon, 30 Sep 2024 13:12:38 -0400 -Subject: [PATCH 1/4] fix(types): Update for newer setuptools - -Signed-off-by: Henry Schreiner ---- - skbuild/setuptools_wrap.py | 2 +- - tests/__init__.py | 6 +++++- - 3 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/skbuild/setuptools_wrap.py b/skbuild/setuptools_wrap.py -index 8e59631b..f6c60cd5 100644 ---- a/skbuild/setuptools_wrap.py -+++ b/skbuild/setuptools_wrap.py -@@ -250,7 +250,7 @@ def _parse_setuptools_arguments( - - return ( - display_only, -- dist.help_commands, # type: ignore[attr-defined] -+ bool(dist.help_commands), - dist.commands, - dist.hide_listing, # type: ignore[attr-defined] - dist.force_cmake, # type: ignore[attr-defined] -diff --git a/tests/__init__.py b/tests/__init__.py -index 4f3c9543..e3942246 100644 ---- a/tests/__init__.py -+++ b/tests/__init__.py -@@ -215,7 +215,11 @@ def execute_setup_py(project_dir, setup_args, disable_languages_test=False): - """ - - # See https://stackoverflow.com/questions/9160227/dir-util-copy-tree-fails-after-shutil-rmtree -- distutils.dir_util._path_created.clear() # type: ignore[attr-defined] -+ to_clear = getattr( -+ distutils.dir_util, "SkipRepeatAbsolutePaths", getattr(distutils.dir_util, "_path_created", None) -+ ) -+ assert to_clear, "Must have one of the two supported clearing mechanisms" -+ to_clear.clear() - - # Clear _PYTHON_HOST_PLATFORM to ensure value sets in skbuild.setuptools_wrap.setup() does not - # influence other tests. - diff --git a/dev-python/scikit-build/scikit-build-0.18.1.ebuild b/dev-python/scikit-build/scikit-build-0.18.1.ebuild deleted file mode 100644 index 504491747ab2d..0000000000000 --- a/dev-python/scikit-build/scikit-build-0.18.1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( pypy3_11 python3_{11..14} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions" -HOMEPAGE=" - https://github.com/scikit-build/scikit-build/ - https://pypi.org/project/scikit-build/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" - -RDEPEND=" - dev-python/distro[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - >=dev-python/setuptools-42.0.0[${PYTHON_USEDEP}] - >=dev-python/wheel-0.32.0[${PYTHON_USEDEP}] -" - -BDEPEND=" - dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}] - dev-python/hatch-vcs[${PYTHON_USEDEP}] - test? ( - >=dev-python/build-0.7[${PYTHON_USEDEP}] - >=dev-python/cython-0.25.1[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - ) -" - -distutils_enable_sphinx docs \ - dev-python/sphinx-rtd-theme \ - dev-python/sphinx-issues -# note: tests are unstable with xdist -EPYTEST_PLUGINS=( pytest-mock ) -distutils_enable_tests pytest - -src_prepare() { - local PATCHES=( - # https://github.com/scikit-build/scikit-build/pull/1120 - "${FILESDIR}/${P}-setuptools-75.patch" - ) - - # not packaged - sed -i -e '/cmakedomain/d' docs/conf.py || die - distutils-r1_src_prepare -} - -python_test() { - - local EPYTEST_DESELECT=( - # Internet (via new setuptools?) - tests/test_hello_cpp.py::test_hello_develop - ) - - # create a separate test tree since skbuild tests install random stuff - cp -r "${BUILD_DIR}"/{install,test} || die - local -x PATH=${BUILD_DIR}/test${EPREFIX}/usr/bin:${PATH} - - epytest -m "not isolated and not nosetuptoolsscm" \ - -o tmp_path_retention_count=1 -}