diff options
Diffstat (limited to 'dev-python/scikit-build')
| -rw-r--r-- | dev-python/scikit-build/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/scikit-build/files/scikit-build-0.18.1-setuptools-75.patch | 42 | ||||
| -rw-r--r-- | dev-python/scikit-build/scikit-build-0.18.1.ebuild | 9 |
3 files changed, 51 insertions, 3 deletions
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest index 6d70ae3c256d..902acd814233 100644 --- a/dev-python/scikit-build/Manifest +++ b/dev-python/scikit-build/Manifest @@ -1,8 +1,9 @@ AUX scikit-build-0.17.6-setuptools-69.3.patch 6448 BLAKE2B d7a964b05468da5d81d08435c1c6d38b1096814693d27c9eb6467dab1809ff63b79a778b4ba07ac357d4128549a5318b312aec1d6f1c702a8fca4e1ddc189579 SHA512 6bb096d4b4c6d451d4c1ef1f4792a8e72e624cbcff5219bb7d4eed1459454c9618bb3bb9a03c39c7ef79f9fa0054ca337da3a1c4ed4cdcc007b8d054f20fbdbb +AUX scikit-build-0.18.1-setuptools-75.patch 1716 BLAKE2B 9efc6500525bed1a0df6e972b98b8608a3a57b6c96053df4364a7ad6ef587a1b69b2f5265615d7e0abcca27f1b9ddc8ed5e6a45f4b34b63cdea27a57e64282aa SHA512 3dc1a9e32b804c936ca181739b192aa14bf79f50ecce35fa60df3e59a512f2d15a01d2a674725f0bbdb2893b8b0bef68fdc56b23bed20f7ae83468d2f35cfa02 DIST scikit_build-0.17.6.tar.gz 272208 BLAKE2B 9e3f908041eca89182f798c54a1a248934dc026816f7cd041a8debc97be27096942dda42a0ae63e87b9337304a478d6f520edcd5ea7a45aae6a195d1f769eed2 SHA512 92b97146f40d8222bd8415ef8439497d5075b72e5bafc40aba0a3e2911d269a118f2f7d41f468f7add8949f550b1fd7d5a9113d249e42dfac431108182ca9198 DIST scikit_build-0.18.0.tar.gz 273824 BLAKE2B 2eac991ea22948e900c4485783f5bcbb8b87bd5858bbe7ade99b2a67c16a9a035e04c53b2d9b94422a5eff36f33c11cf297198bce520ba818b7355386977a8a1 SHA512 a374f86c69a288ddcfe8e8d95b594b2bf94365b4d6d4d25a7912cf871f12dfb1866b1d74694c919ef8e4fef3d166b7afe9de3b32b56add33173840a9bb917c71 DIST scikit_build-0.18.1.tar.gz 274171 BLAKE2B af82af368f883450c98670e26c414181ab60ef04615986843967f537e206e6c64901c9eace8f12af12f067178cad14886d853d230200463b00452f7ec550436f SHA512 872f4bc4c313459842b537ded5503799da5b5e02a8e403eb3095edd719ea7be32942ce4e9c7cd55a4f78c2f032627f7398e99db6be19b711c8e1d906264dba48 EBUILD scikit-build-0.17.6.ebuild 1947 BLAKE2B e3354e758ea960d8fb58bba365d82e30d6e3d2dec873f17f85e9da980c6b6a2af37e41e18d8299a5ec5ad09ebb56df8527964765c972f7c9502365b030ca09f4 SHA512 eb28f97b736112f7140d060926c1aced89ec446a4285bdac8f9592fb02d67b29347af29b0f8116afec88c04e3a4fd6a0677a2a38ba02daee170d825f4f064958 EBUILD scikit-build-0.18.0.ebuild 1869 BLAKE2B f14f6d67766d6131d745b40249f79b759a5eb0933be374c6f21ca165e45fae5c9af7efdd8cfd9ef842a0f88f7d075ff8a7b193e67eca906599e07b6802c146a2 SHA512 44b3e05fcb5e4bb317d0b0f9a87785dc4b4e02bd70ff5a9edecce670fd206530362232ff221bd87f1105ccf1d1acf43ca7dbcc263345cf50be17f52f7876fb22 -EBUILD scikit-build-0.18.1.ebuild 1865 BLAKE2B 9480fd9410edbe7eb7e2a32d18a54da0314d050f16502303a17d86ba4f6a02e13b671a9786eabb712857c0991ab771d1335937cf9e0eac71451ae8c382b569b5 SHA512 5b8c3e7bd3d3d53f276d5e7ccbc822989722c316ebe565ee320fa74d439588611127ed7b3f18bcf801dcb1129ada498ee9f720a7b4026b899baa70d9301f79fc +EBUILD scikit-build-0.18.1.ebuild 1995 BLAKE2B 1e6291c85fed6a993fb20bc46b921d2a084ca8441bcdf3c9a0f339c9b123ac3719659c659e5191bd3803950d4e2935bf197c3c97a4ff2fce4dfe702aa7dd4b46 SHA512 5f4a1f1966869d5a1c908b865c65f401b9fa5c46627b85ca19e6e29533246c558cc6b57e974681d03d7e2081c3ad786d6ddc846d28203714fb9a2ce3bfc4d13f MISC metadata.xml 473 BLAKE2B 9d02a79439618fa413f74e4a617b8af042879be7a44c8f1c33e254e985d4f24057321fb2ec0b73074be1f6b67af3984190e48669e19985d6297411c0c5b61a79 SHA512 afc398c6287ce67eb85402832684fd006385e70d28a738ca8c5f1e2d008526621121cd9107a7fbc217a1a5857b54fa1dce3de69c47db58fc76990764b814a36d 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 new file mode 100644 index 000000000000..033b98fd2c58 --- /dev/null +++ b/dev-python/scikit-build/files/scikit-build-0.18.1-setuptools-75.patch @@ -0,0 +1,42 @@ +From 3992485c67331097553ec8f54233c4c295943f70 Mon Sep 17 00:00:00 2001 +From: Henry Schreiner <henryschreineriii@gmail.com> +Date: Mon, 30 Sep 2024 13:12:38 -0400 +Subject: [PATCH 1/4] fix(types): Update for newer setuptools + +Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> +--- + 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 index 8a119d956bc9..6e3c98ae15a7 100644 --- a/dev-python/scikit-build/scikit-build-0.18.1.ebuild +++ b/dev-python/scikit-build/scikit-build-0.18.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2024 Gentoo Authors +# 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 python3_{10..13} ) +PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} ) inherit distutils-r1 pypi @@ -48,6 +48,11 @@ distutils_enable_sphinx docs \ 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 |