commit: bb8c8c21cef6b152e1f66d1cd823d25c1710b66e Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Sep 22 02:12:55 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Sep 22 02:17:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb8c8c21
dev-python/scikit-build-core: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/scikit-build-core/Manifest | 3 -- .../scikit-build-core-0.4.7-setuptools-hooks.patch | 28 ------------ .../scikit-build-core-0.4.7-r1.ebuild | 52 --------------------- .../scikit-build-core-0.4.8.ebuild | 48 -------------------- .../scikit-build-core-0.5.0.ebuild | 53 ---------------------- profiles/package.mask | 6 --- 6 files changed, 190 deletions(-) diff --git a/dev-python/scikit-build-core/Manifest b/dev-python/scikit-build-core/Manifest index 897371efb243..ae87c7929ef6 100644 --- a/dev-python/scikit-build-core/Manifest +++ b/dev-python/scikit-build-core/Manifest @@ -1,4 +1 @@ -DIST scikit_build_core-0.4.7.tar.gz 161024 BLAKE2B a06136ca6144305290dcebacd33690556ce30c28793572adfd7b42b043d4bb7f2e6e8000fcb543608d33a130f7094683a31870aa40067fb24fbb453fed884ccf SHA512 39f99facc920e3a46a3592d15ce9f3ceb90cf92dca8a010546a9cc15d50ea7737951286b6474f2f3f68f206f4fa7d157931fcfa831e122f51266df56ec5f043e -DIST scikit_build_core-0.4.8.tar.gz 163396 BLAKE2B f432d144babd6be45a730e0566cf6fe8bea051b85364b0af26655e0679a0d458f3fd106e816f09557110a6e4e1fed056d1c6454c044ab34dfcc6530cad6020e3 SHA512 55ded022de13bbc60e5abed7b39466751abda3d66a0fa1c094ccd3ab28a93ac3437db2fb8e53381bbe0f7da9985ea5a6fd129af24e6654d3df48c704fb4612f1 -DIST scikit_build_core-0.5.0.tar.gz 177478 BLAKE2B e3f3d4bb60fcdc87b32799a663a96bfc994969c3a9dd6c73bd5f27720482cd02b8bbf75f7aee8b39c3b73dc8b6740c526a144b59ecb029e7de3b604dcb1aceb8 SHA512 68bd13b5f97aa498189a61e342bdcb6fa5ea45d8ee73cc557b1e67c9a8d411ef93ea59a954210f48b76e7c1a2f645e4e34686e6fa122929cf0bc69a9f3846600 DIST scikit_build_core-0.5.1.tar.gz 179718 BLAKE2B 31cd974a3deec188dc97ca708a04badfa8d75a0e66e85a2a814816bac126921aa5531f4f0de56f93a264b98edd341498298e1536502506d7b47ff40ca8bf92da SHA512 de7dd843a7979615a1421bc9ea6c0fde40b72ed94209783f176a5fb427a9fdee497a69e891441591d65d06a3ea619c4c67c9314cf0b7622d19cd88c149b43c7b diff --git a/dev-python/scikit-build-core/files/scikit-build-core-0.4.7-setuptools-hooks.patch b/dev-python/scikit-build-core/files/scikit-build-core-0.4.7-setuptools-hooks.patch deleted file mode 100644 index f3b352644b0d..000000000000 --- a/dev-python/scikit-build-core/files/scikit-build-core-0.4.7-setuptools-hooks.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://bugs.gentoo.org/909035 -https://bugs.gentoo.org/909335 -https://github.com/scikit-build/scikit-build-core/issues/413 -https://github.com/scikit-build/scikit-build-core/commit/fd9e6cf638a14dee2fb39b36e41b607ce8221d27 - -From fd9e6cf638a14dee2fb39b36e41b607ce8221d27 Mon Sep 17 00:00:00 2001 -From: Henry Schreiner <henryschreiner...@gmail.com> -Date: Sat, 24 Jun 2023 15:07:26 -0400 -Subject: [PATCH] fix: avoid interfering with other setuptools plugins (#414) - -Fix #413. - ---------- - -Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> ---- a/src/scikit_build_core/setuptools/build_cmake.py -+++ b/src/scikit_build_core/setuptools/build_cmake.py -@@ -182,7 +182,8 @@ def _has_cmake(dist: Distribution) -> bool: - def _prepare_extension_detection(dist: Distribution) -> None: - # Setuptools needs to know that it has extensions modules - -- dist.has_ext_modules = lambda: type(dist).has_ext_modules(dist) or _has_cmake(dist) # type: ignore[method-assign] -+ orig_has_ext_modules = dist.has_ext_modules -+ dist.has_ext_modules = lambda: orig_has_ext_modules() or _has_cmake(dist) # type: ignore[method-assign] - - # Hack for stdlib distutils - if not setuptools.distutils.__package__.startswith("setuptools"): # type: ignore[attr-defined] - diff --git a/dev-python/scikit-build-core/scikit-build-core-0.4.7-r1.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.4.7-r1.ebuild deleted file mode 100644 index b3c010a4c60d..000000000000 --- a/dev-python/scikit-build-core/scikit-build-core-0.4.7-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( python3_{10..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Build backend for CMake based projects" -HOMEPAGE=" - https://github.com/scikit-build/scikit-build-core/ - https://pypi.org/project/scikit-build-core/ -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -# we always want [pyproject] extra -RDEPEND=" - >=dev-python/packaging-20.9[${PYTHON_USEDEP}] - >=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}] - >=dev-python/pyproject-metadata-0.5[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/exceptiongroup[${PYTHON_USEDEP}] - >=dev-python/tomli-1.1[${PYTHON_USEDEP}] - ' 3.9 3.10) -" -BDEPEND=" - dev-python/hatch-vcs[${PYTHON_USEDEP}] - test? ( - dev-python/build[${PYTHON_USEDEP}] - >=dev-python/cattrs-22.2.0[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - >=dev-python/pytest-subprocess-1.5[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}"/${P}-setuptools-hooks.patch -) - -distutils_enable_tests pytest - -python_test() { - epytest -m "not isolated and not network" -} diff --git a/dev-python/scikit-build-core/scikit-build-core-0.4.8.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.4.8.ebuild deleted file mode 100644 index 83fef30306b6..000000000000 --- a/dev-python/scikit-build-core/scikit-build-core-0.4.8.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( python3_{10..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Build backend for CMake based projects" -HOMEPAGE=" - https://github.com/scikit-build/scikit-build-core/ - https://pypi.org/project/scikit-build-core/ -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -# we always want [pyproject] extra -RDEPEND=" - >=dev-python/packaging-20.9[${PYTHON_USEDEP}] - >=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}] - >=dev-python/pyproject-metadata-0.5[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/exceptiongroup[${PYTHON_USEDEP}] - >=dev-python/tomli-1.1[${PYTHON_USEDEP}] - ' 3.9 3.10) -" -BDEPEND=" - dev-python/hatch-vcs[${PYTHON_USEDEP}] - test? ( - dev-python/build[${PYTHON_USEDEP}] - >=dev-python/cattrs-22.2.0[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - >=dev-python/pytest-subprocess-1.5[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_test() { - epytest -m "not isolated and not network" -} diff --git a/dev-python/scikit-build-core/scikit-build-core-0.5.0.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.5.0.ebuild deleted file mode 100644 index b3a6b7200a22..000000000000 --- a/dev-python/scikit-build-core/scikit-build-core-0.5.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( python3_{10..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Build backend for CMake based projects" -HOMEPAGE=" - https://github.com/scikit-build/scikit-build-core/ - https://pypi.org/project/scikit-build-core/ -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -# we always want [pyproject] extra -RDEPEND=" - >=dev-python/packaging-20.9[${PYTHON_USEDEP}] - >=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}] - >=dev-python/pyproject-metadata-0.5[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/exceptiongroup[${PYTHON_USEDEP}] - >=dev-python/tomli-1.1[${PYTHON_USEDEP}] - ' 3.9 3.10) -" -BDEPEND=" - dev-python/hatch-vcs[${PYTHON_USEDEP}] - test? ( - dev-python/build[${PYTHON_USEDEP}] - >=dev-python/cattrs-22.2.0[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - >=dev-python/pytest-subprocess-1.5[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_test() { - local EPYTEST_DESELECT=( - # TODO / we don't package validate_pyproject anyway - tests/test_schema.py::test_compare_schemas - ) - - epytest -m "not isolated and not network" -} diff --git a/profiles/package.mask b/profiles/package.mask index 12cd51969c8a..f50ab2db2b14 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -402,12 +402,6 @@ acct-group/spi # may or may not lead to useful results. <dev-util/catalyst-4 -# Michał Górny <mgo...@gentoo.org> (2023-07-12) -# Having scikit-build-core installed still breaks building setuptools -# extensions in some scenarios. -# https://github.com/scikit-build/scikit-build-core/issues/426 -=dev-python/scikit-build-core-0.4.7-r1 - # Matt Turner <matts...@gentoo.org> (2023-07-06) # GNOME 45 mask >=app-accessibility/orca-45_alpha
