commit: 653bd4dd3500d54ecd4a1e10ede2a60e42ad2c8b Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Oct 10 11:13:05 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Oct 10 11:24:31 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=653bd4dd
dev-python/scikit-build: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/scikit-build/Manifest | 2 - .../scikit-build-0.17.6-setuptools-69.3.patch | 164 --------------------- dev-python/scikit-build/scikit-build-0.17.6.ebuild | 77 ---------- dev-python/scikit-build/scikit-build-0.18.0.ebuild | 73 --------- 4 files changed, 316 deletions(-) diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest index 1250f0524af1..88e42dfdb653 100644 --- a/dev-python/scikit-build/Manifest +++ b/dev-python/scikit-build/Manifest @@ -1,3 +1 @@ -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 diff --git a/dev-python/scikit-build/files/scikit-build-0.17.6-setuptools-69.3.patch b/dev-python/scikit-build/files/scikit-build-0.17.6-setuptools-69.3.patch deleted file mode 100644 index ce5121bea72f..000000000000 --- a/dev-python/scikit-build/files/scikit-build-0.17.6-setuptools-69.3.patch +++ /dev/null @@ -1,164 +0,0 @@ -From acee12430753e8350435d4304196e8eaa654ccd6 Mon Sep 17 00:00:00 2001 -From: Steve Kowalik <[email protected]> -Date: Mon, 3 Jun 2024 20:47:20 +1000 -Subject: [PATCH] Support setuptools 69.3.0 changes in four tests - -setuptools 69.3.0 now canonicalizes package names in filenames, which -means all dashes are now converted to underscores, leading to test -failures due to FileNotFoundErrors. Handle both cases to support older -and newer setuptools. ---- - tests/test_hello_cython.py | 23 ++++++++++++++--------- - tests/test_hello_fortran.py | 29 +++++++++++++++++------------ - tests/test_hello_pure.py | 15 ++++++++++----- - tests/test_manifest_in.py | 17 +++++++++++------ - 4 files changed, 52 insertions(+), 32 deletions(-) - -diff --git a/tests/test_hello_cython.py b/tests/test_hello_cython.py -index dc95f697..1d9e944d 100644 ---- a/tests/test_hello_cython.py -+++ b/tests/test_hello_cython.py -@@ -29,20 +29,25 @@ def test_hello_cython_sdist(): - sdists_zip = glob.glob("dist/*.zip") - assert sdists_tar or sdists_zip - -+ dirname = "hello-cython-1.2.3" -+ # setuptools 69.3.0 and above now canonicalize the filename as well. -+ if any("hello_cython" in x for x in sdists_zip + sdists_tar): -+ dirname = "hello_cython-1.2.3" -+ - expected_content = [ -- "hello-cython-1.2.3/CMakeLists.txt", -- "hello-cython-1.2.3/hello/_hello.pyx", -- "hello-cython-1.2.3/hello/CMakeLists.txt", -- "hello-cython-1.2.3/hello/__init__.py", -- "hello-cython-1.2.3/hello/__main__.py", -- "hello-cython-1.2.3/setup.py", -+ f"{dirname}/CMakeLists.txt", -+ f"{dirname}/hello/_hello.pyx", -+ f"{dirname}/hello/CMakeLists.txt", -+ f"{dirname}/hello/__init__.py", -+ f"{dirname}/hello/__main__.py", -+ f"{dirname}/setup.py", - ] - -- sdist_archive = "dist/hello-cython-1.2.3.zip" -+ sdist_archive = f"dist/{dirname}.zip" - if sdists_tar: -- sdist_archive = "dist/hello-cython-1.2.3.tar.gz" -+ sdist_archive = f"dist/{dirname}.tar.gz" - -- check_sdist_content(sdist_archive, "hello-cython-1.2.3", expected_content, package_dir="hello") -+ check_sdist_content(sdist_archive, dirname, expected_content, package_dir="hello") - - - @project_setup_py_test("hello-cython", ["bdist_wheel"]) -diff --git a/tests/test_hello_fortran.py b/tests/test_hello_fortran.py -index 41f5f444..be9cede9 100644 ---- a/tests/test_hello_fortran.py -+++ b/tests/test_hello_fortran.py -@@ -33,23 +33,28 @@ def test_hello_fortran_sdist(): - sdists_zip = glob.glob("dist/*.zip") - assert sdists_tar or sdists_zip - -+ dirname = "hello-fortran-1.2.3" -+ # setuptools 69.3.0 and above now canonicalize the filename as well. -+ if any("hello_fortran" in x for x in sdists_zip + sdists_tar): -+ dirname = "hello_fortran-1.2.3" -+ - expected_content = [ -- "hello-fortran-1.2.3/bonjour/_bonjour.f90", -- "hello-fortran-1.2.3/bonjour/_bonjour.pyf", -- "hello-fortran-1.2.3/bonjour/CMakeLists.txt", -- "hello-fortran-1.2.3/CMakeLists.txt", -- "hello-fortran-1.2.3/hello/_hello.f90", -- "hello-fortran-1.2.3/hello/CMakeLists.txt", -- "hello-fortran-1.2.3/hello/__init__.py", -- "hello-fortran-1.2.3/hello/__main__.py", -- "hello-fortran-1.2.3/setup.py", -+ f"{dirname}/bonjour/_bonjour.f90", -+ f"{dirname}/bonjour/_bonjour.pyf", -+ f"{dirname}/bonjour/CMakeLists.txt", -+ f"{dirname}/CMakeLists.txt", -+ f"{dirname}/hello/_hello.f90", -+ f"{dirname}/hello/CMakeLists.txt", -+ f"{dirname}/hello/__init__.py", -+ f"{dirname}/hello/__main__.py", -+ f"{dirname}/setup.py", - ] - -- sdist_archive = "dist/hello-fortran-1.2.3.zip" -+ sdist_archive = f"dist/{dirname}.zip" - if sdists_tar: -- sdist_archive = "dist/hello-fortran-1.2.3.tar.gz" -+ sdist_archive = f"dist/{dirname}.tar.gz" - -- check_sdist_content(sdist_archive, "hello-fortran-1.2.3", expected_content) -+ check_sdist_content(sdist_archive, dirname, expected_content) - - - @pytest.mark.fortran() -diff --git a/tests/test_hello_pure.py b/tests/test_hello_pure.py -index 21b0840b..cc176854 100644 ---- a/tests/test_hello_pure.py -+++ b/tests/test_hello_pure.py -@@ -27,16 +27,21 @@ def test_hello_pure_sdist(): - sdists_zip = glob.glob("dist/*.zip") - assert sdists_tar or sdists_zip - -+ dirname = "hello-pure-1.2.3" -+ # setuptools 69.3.0 and above now canonicalize the filename as well. -+ if any("hello_pure" in x for x in sdists_zip + sdists_tar): -+ dirname = "hello_pure-1.2.3" -+ - expected_content = [ -- "hello-pure-1.2.3/hello/__init__.py", -- "hello-pure-1.2.3/setup.py", -+ f"{dirname}/hello/__init__.py", -+ f"{dirname}/setup.py", - ] - -- sdist_archive = "dist/hello-pure-1.2.3.zip" -+ sdist_archive = f"dist/{dirname}.zip" - if sdists_tar: -- sdist_archive = "dist/hello-pure-1.2.3.tar.gz" -+ sdist_archive = f"dist/{dirname}.tar.gz" - -- check_sdist_content(sdist_archive, "hello-pure-1.2.3", expected_content) -+ check_sdist_content(sdist_archive, dirname, expected_content) - - - @project_setup_py_test("hello-pure", ["bdist_wheel"], disable_languages_test=True) -diff --git a/tests/test_manifest_in.py b/tests/test_manifest_in.py -index 86652308..65c23d1a 100644 ---- a/tests/test_manifest_in.py -+++ b/tests/test_manifest_in.py -@@ -21,17 +21,22 @@ def test_manifest_in_sdist(): - sdists_zip = glob.glob("dist/*.zip") - assert sdists_tar or sdists_zip - -+ dirname = "manifest-in-1.2.3" -+ # setuptools 69.3.0 and above now canonicalize the filename as well. -+ if any("manifest_in" in x for x in sdists_zip + sdists_tar): -+ dirname = "manifest_in-1.2.3" -+ - expected_content = [ -- "manifest-in-1.2.3/hello/__init__.py", -- "manifest-in-1.2.3/setup.py", -- "manifest-in-1.2.3/MANIFEST.in", -+ f"{dirname}/hello/__init__.py", -+ f"{dirname}/setup.py", -+ f"{dirname}/MANIFEST.in", - ] - -- sdist_archive = "dist/manifest-in-1.2.3.zip" -+ sdist_archive = f"dist/{dirname}.zip" - if sdists_tar: -- sdist_archive = "dist/manifest-in-1.2.3.tar.gz" -+ sdist_archive = f"dist/{dirname}.tar.gz" - -- check_sdist_content(sdist_archive, "manifest-in-1.2.3", expected_content) -+ check_sdist_content(sdist_archive, dirname, expected_content) - - - @project_setup_py_test("manifest-in", ["bdist_wheel"], disable_languages_test=True) diff --git a/dev-python/scikit-build/scikit-build-0.17.6.ebuild b/dev-python/scikit-build/scikit-build-0.17.6.ebuild deleted file mode 100644 index 3d280e6df67f..000000000000 --- a/dev-python/scikit-build/scikit-build-0.17.6.ebuild +++ /dev/null @@ -1,77 +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=( python3_{11..13} ) - -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 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}] - $(python_gen_cond_dep ' - dev-python/tomli[${PYTHON_USEDEP}] - ' 3.10) - >=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/pytest-mock-1.10.4[${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 -distutils_enable_tests pytest - -src_prepare() { - local PATCHES=( - # https://github.com/scikit-build/scikit-build/pull/1087 - "${FILESDIR}/${P}-setuptools-69.3.patch" - ) - - # not packaged - sed -i -e '/cmakedomain/d' docs/conf.py || die - distutils-r1_src_prepare -} - -python_test() { - local EPYTEST_DESELECT=() - - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # no "library" in (our install of) pypy3 - tests/test_cmaker.py::test_get_python_library - ) - ;; - esac - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -p pytest_mock \ - -m "not isolated and not nosetuptoolsscm" \ - -o tmp_path_retention_count=1 - rm -r "${BUILD_DIR}/install$(python_get_sitedir)"/{easy-install.pth,*.egg,*.egg-link} || die -} diff --git a/dev-python/scikit-build/scikit-build-0.18.0.ebuild b/dev-python/scikit-build/scikit-build-0.18.0.ebuild deleted file mode 100644 index 168be8f52e57..000000000000 --- a/dev-python/scikit-build/scikit-build-0.18.0.ebuild +++ /dev/null @@ -1,73 +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 python3_{10..13} ) - -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}] - $(python_gen_cond_dep ' - dev-python/tomli[${PYTHON_USEDEP}] - ' 3.10) - >=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/pytest-mock-1.10.4[${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 -distutils_enable_tests pytest - -src_prepare() { - # not packaged - sed -i -e '/cmakedomain/d' docs/conf.py || die - distutils-r1_src_prepare -} - -python_test() { - local EPYTEST_DESELECT=() - - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # no "library" in (our install of) pypy3 - tests/test_cmaker.py::test_get_python_library - ) - ;; - esac - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -p pytest_mock \ - -m "not isolated and not nosetuptoolsscm" \ - -o tmp_path_retention_count=1 - rm -r "${BUILD_DIR}/install$(python_get_sitedir)"/{easy-install.pth,*.egg,*.egg-link} || die -}
