[gentoo-commits] repo/gentoo:master commit in: dev-python/scikit-build/files/, dev-python/scikit-build/

[gentoo-commits] repo/gentoo:master commit in: dev-python/scikit-build/files/, dev-python/scikit-build/

[Benda XU]

commit:     dbcd93928d90ed3799a360c002dbf17448d975e4
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Thu Jan 16 16:03:15 2020 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 12:43:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbcd9392

dev-python/scikit-build: Improved build system generator for CPython

  C, C++, Cython and Fortran extensions

Bug: https://github.com/gentoo/gentoo/pull/14344
Bug: https://bugs.gentoo.org/705872

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 dev-python/scikit-build/Manifest                   |   1 +
 .../files/scikit-build-0.10.0-docs.patch           |  19 +++
 ...build-0.10.0-skip-sandbox-violation-tests.patch | 132 +++++++++++++++++++++
 dev-python/scikit-build/metadata.xml               |   9 ++
 dev-python/scikit-build/scikit-build-0.10.0.ebuild |  39 ++++++
 5 files changed, 200 insertions(+)

diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
new file mode 100644
index 00000000000..dcc86e2bd4e
--- /dev/null
+++ b/dev-python/scikit-build/Manifest
@@ -0,0 +1 @@
+DIST scikit-build-0.10.0.tar.gz 132443 BLAKE2B 7e817b1b6d8ea5e663cec59c5ed51b3f58318eedf6587380eb2a1458bac772a5a02a936015027f1200f740884ba33512babb1aadc4cdbb59ea38f46bc36cbb5f SHA512 cbdc59a41c60c162be84b38d207838d5e38898871f2ef02dcb672796f01f7a31645892770172e9891a4dd7aa02a85dd489b6dede4c5f717ab013dd8947d5d314

diff --git a/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch b/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch
new file mode 100644
index 00000000000..f48ad934075
--- /dev/null
+++ b/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch
@@ -0,0 +1,19 @@
+diff --git a/docs/conf.py b/docs/conf.py
+index 094ed23..a58cb85 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -41,7 +41,6 @@ import skbuild
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+ extensions = [
+-    'cmake',
+     'sphinx.ext.autodoc',
+     'sphinx.ext.viewcode',
+     'sphinx_issues'
+@@ -291,4 +290,4 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+ if not on_rtd:  # only import and set the theme if we're building docs locally
+     import sphinx_rtd_theme
+     html_theme = 'sphinx_rtd_theme'
+-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+\ No newline at end of file
++    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]

diff --git a/dev-python/scikit-build/files/scikit-build-0.10.0-skip-sandbox-violation-tests.patch b/dev-python/scikit-build/files/scikit-build-0.10.0-skip-sandbox-violation-tests.patch
new file mode 100644
index 00000000000..9148db88660
--- /dev/null
+++ b/dev-python/scikit-build/files/scikit-build-0.10.0-skip-sandbox-violation-tests.patch
@@ -0,0 +1,132 @@
+This patch removes coverage tests (dep on pytest-cov which is deprecated)
+It also removes the tests that test the setup.py file
+These tests give 'permission denied' exceptions because it calls commands like 'setup.py install'
+diff --git a/tests/test_hello_cpp.py b/tests/test_hello_cpp.py
+index d39c8ef..0419b88 100644
+--- a/tests/test_hello_cpp.py
++++ b/tests/test_hello_cpp.py
+@@ -182,24 +182,3 @@ def test_hello_cleans(capfd):
+     assert "removing '{}'".format(SKBUILD_DIR()) == clean1_out.splitlines()[3]
+ 
+     assert "running clean" == clean2_out
+-
+-
+-@project_setup_py_test("hello-cpp", ["develop"])
+-def test_hello_develop():
+-    for expected_file in [
+-        # These files are the "regular" source files
+-        'setup.py',
+-        'CMakeLists.txt',
+-        'bonjour/__init__.py',
+-        'bonjourModule.py',
+-        'hello/__init__.py',
+-        'hello/__main__.py',
+-        'hello/_hello.cxx',
+-        'hello/CMakeLists.txt',
+-        # These files are "generated" by CMake and
+-        # are copied from CMAKE_INSTALL_DIR
+-        'hello/_hello%s' % (sysconfig.get_config_var('SO')),
+-        'hello/world.py',
+-        'helloModule.py'
+-    ]:
+-        assert os.path.exists(expected_file)
+diff --git a/tests/test_issue274_support_default_package_dir.py b/tests/test_issue274_support_default_package_dir.py
+deleted file mode 100644
+index 536f7b2..0000000
+--- a/tests/test_issue274_support_default_package_dir.py
++++ /dev/null
+@@ -1,27 +0,0 @@
+-
+-from . import (
+-    _tmpdir, execute_setup_py, initialize_git_repo_and_commit,
+-    prepare_project, project_setup_py_test, push_dir
+-)
+-
+-
+-@project_setup_py_test("issue-274-support-default-package-dir", ["install"], disable_languages_test=True)
+-def test_install_command():
+-    pass
+-
+-
+-def test_test_command():
+-    with push_dir():
+-
+-        tmp_dir = _tmpdir('test_test_command')
+-        project = "issue-274-support-default-package-dir"
+-        prepare_project(project, tmp_dir)
+-        initialize_git_repo_and_commit(tmp_dir, verbose=True)
+-
+-        try:
+-            with execute_setup_py(tmp_dir, ["test"], disable_languages_test=True):
+-                pass
+-        except SystemExit as exc:
+-            assert exc.code == 0
+-
+-        assert tmp_dir.join("test_hello.completed.txt").exists()
+diff --git a/tests/test_issue274_support_one_package_without_package_dir.py b/tests/test_issue274_support_one_package_without_package_dir.py
+deleted file mode 100644
+index 6612087..0000000
+--- a/tests/test_issue274_support_one_package_without_package_dir.py
++++ /dev/null
+@@ -1,27 +0,0 @@
+-
+-from . import (
+-    _tmpdir, execute_setup_py, initialize_git_repo_and_commit,
+-    prepare_project, project_setup_py_test, push_dir
+-)
+-
+-
+-@project_setup_py_test("issue-274-support-one-package-without-package-dir", ["install"], disable_languages_test=True)
+-def test_install_command():
+-    pass
+-
+-
+-def test_test_command():
+-    with push_dir():
+-
+-        tmp_dir = _tmpdir('test_test_command')
+-        project = "issue-274-support-one-package-without-package-dir"
+-        prepare_project(project, tmp_dir)
+-        initialize_git_repo_and_commit(tmp_dir, verbose=True)
+-
+-        try:
+-            with execute_setup_py(tmp_dir, ["test"], disable_languages_test=True):
+-                pass
+-        except SystemExit as exc:
+-            assert exc.code == 0
+-
+-        assert tmp_dir.join("test_hello.completed.txt").exists()
+diff --git a/tests/test_issue284_build_ext_inplace.py b/tests/test_issue284_build_ext_inplace.py
+deleted file mode 100644
+index 78dd3dd..0000000
+--- a/tests/test_issue284_build_ext_inplace.py
++++ /dev/null
+@@ -1,15 +0,0 @@
+-
+-import os
+-import sysconfig
+-
+-from distutils import sysconfig as du_sysconfig
+-
+-from . import project_setup_py_test
+-
+-
+-@project_setup_py_test("issue-284-build-ext-inplace", ["build_ext", "--inplace"], disable_languages_test=True)
+-def test_build_ext_inplace_command():
+-    assert os.path.exists('hello/_hello_sk%s' % sysconfig.get_config_var('SO'))
+-
+-    # See issue scikit-build #383
+-    assert os.path.exists('hello/_hello_ext%s' % du_sysconfig.get_config_var('SO'))
+diff --git a/tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py b/tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
+deleted file mode 100644
+index 2285bfb..0000000
+--- a/tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
++++ /dev/null
+@@ -1,7 +0,0 @@
+-
+-from . import project_setup_py_test
+-
+-
+-@project_setup_py_test("issue-334-configure-cmakelist-non-cp1252-encoding", ["install"], disable_languages_test=True)
+-def test_install_command():
+-    pass

diff --git a/dev-python/scikit-build/metadata.xml b/dev-python/scikit-build/metadata.xml
new file mode 100644
index 00000000000..ca93985fb0d
--- /dev/null
+++ b/dev-python/scikit-build/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+</pkgmetadata>

diff --git a/dev-python/scikit-build/scikit-build-0.10.0.ebuild b/dev-python/scikit-build/scikit-build-0.10.0.ebuild
new file mode 100644
index 00000000000..f4eb8f1ef3e
--- /dev/null
+++ b/dev-python/scikit-build/scikit-build-0.10.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
+HOMEPAGE="https://github.com/scikit-build/scikit-build"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/coverage[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]
+	dev-python/path-py[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-runner[${PYTHON_USEDEP}]
+	dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+	dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${P}-docs.patch"
+	"${FILESDIR}/${P}-skip-sandbox-violation-tests.patch" )
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinx-issues
+distutils_enable_tests pytest

[gentoo-commits] repo/gentoo:master commit in: dev-python/scikit-build/files/, dev-python/scikit-build/

[Michał Górny]

commit:     50a68a4760d3e65dfd19ad366e4b4fc6ca239701
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 17:29:33 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 17:42:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50a68a47

dev-python/scikit-build: Enable py3.10

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../files/scikit-build-0.11.1-py310.patch          | 28 ++++++++++++++++++++++
 dev-python/scikit-build/scikit-build-0.11.1.ebuild |  9 ++++---
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch b/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch
new file mode 100644
index 00000000000..fa00556f9ad
--- /dev/null
+++ b/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch
@@ -0,0 +1,28 @@
+From c1677527af3f7afd48ebbe1b2338ac822f64c524 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 19 Jun 2021 19:27:09 +0200
+Subject: [PATCH] fix: fix regex in test_get_python_version for Python 3.10
+
+Fix the regular expression in test_get_python_version to permit
+the minor version to contain more than one digit.  This fixes the test
+on Python 3.10.
+---
+ tests/test_cmaker.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_cmaker.py b/tests/test_cmaker.py
+index d63059c..52d0028 100644
+--- a/tests/test_cmaker.py
++++ b/tests/test_cmaker.py
+@@ -21,7 +21,7 @@ from . import _tmpdir, get_cmakecache_variables
+ 
+ 
+ def test_get_python_version():
+-    assert re.match(r'^[23](\.?)[0-9]$', CMaker.get_python_version())
++    assert re.match(r'^[23](\.?)\d+$', CMaker.get_python_version())
+ 
+ 
+ def test_get_python_include_dir():
+-- 
+2.32.0
+

diff --git a/dev-python/scikit-build/scikit-build-0.11.1.ebuild b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
index b65c6bdf689..bbebf508eb9 100644
--- a/dev-python/scikit-build/scikit-build-0.11.1.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -32,7 +32,10 @@ DEPEND="
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 	)"
 
-PATCHES=( "${FILESDIR}/${PN}-0.10.0-docs.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.0-docs.patch"
+	"${FILESDIR}"/${P}-py310.patch
+)
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme \

[gentoo-commits] repo/gentoo:master commit in: dev-python/scikit-build/files/, dev-python/scikit-build/

[Marek Szuba]

commit:     ad24f93246ed63d6c7e9038bbd69a2a766a844ca
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 15 22:28:56 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Aug 16 11:45:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad24f932

dev-python/scikit-build: strip coverage-related pytest options

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../files/scikit-build-0.12.0-tests-no-coverage.patch         | 11 +++++++++++
 dev-python/scikit-build/scikit-build-0.12.0.ebuild            |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/dev-python/scikit-build/files/scikit-build-0.12.0-tests-no-coverage.patch b/dev-python/scikit-build/files/scikit-build-0.12.0-tests-no-coverage.patch
new file mode 100644
index 00000000000..993258961f3
--- /dev/null
+++ b/dev-python/scikit-build/files/scikit-build-0.12.0-tests-no-coverage.patch
@@ -0,0 +1,11 @@
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -10,7 +10,7 @@
+ 
+ [tool:pytest]
+ testpaths = tests
+-addopts = -v --cov --cov-report xml -ra --strict-markers --showlocals --color=yes
++addopts = -v -ra --strict-markers --showlocals --color=yes
+ markers = 
+ 	fortran: fortran testing
+ 

diff --git a/dev-python/scikit-build/scikit-build-0.12.0.ebuild b/dev-python/scikit-build/scikit-build-0.12.0.ebuild
index 18279621e56..660e2c16948 100644
--- a/dev-python/scikit-build/scikit-build-0.12.0.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.12.0.ebuild
@@ -30,6 +30,10 @@ DEPEND="
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.12.0-tests-no-coverage.patch
+)
+
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme \
 	dev-python/sphinx-issues

[gentoo-commits] repo/gentoo:master commit in: dev-python/scikit-build/files/, dev-python/scikit-build/

[Michał Górny]

commit:     761660036b995d2993e534263b742a2bb6fc5f50
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 18 20:08:01 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep 18 20:56:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76166003

dev-python/scikit-build: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/scikit-build/Manifest                   |  1 -
 .../files/scikit-build-0.10.0-docs.patch           | 19 --------
 .../files/scikit-build-0.11.1-py310.patch          | 28 ------------
 dev-python/scikit-build/scikit-build-0.11.1.ebuild | 53 ----------------------
 4 files changed, 101 deletions(-)

diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index 9180ab42c1d..f65a3e93331 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,2 +1 @@
-DIST scikit-build-0.11.1.tar.gz 132025 BLAKE2B 0f818d8da896695ee0d6b046249e74cbd4ea643bec0515d6ac6ff4276d92430a1dbf81abb3b7c10890538c373225a45cc21b0906de891f1a5390226be914dacd SHA512 030c6cc727d39cbafd2865722de9c45ba2f13461461cf75019b9caf6afd0a776b4f598fa2ce102b5adbc770140ab1de2c33e2bbd3ef03c958ae8849e5fc26cb4
 DIST scikit-build-0.12.0.tar.gz 138053 BLAKE2B 5007bd070cee14056cbc9cc24a022a39c920ce7fa794a79dcdb707f185529e1ed2442a201593f6df8d2dd9b4ab7a9a1ed209b0bc08f3feae748edd06894f8661 SHA512 76be92d8ff96dc230e38dc36a58021399dd8c57b6883dc032fbcd8f01ce42c879c6d557e7a46d48aa9b8bc724270f409f3760824d5810654b53a1aca25ec1cf9

diff --git a/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch b/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch
deleted file mode 100644
index f48ad934075..00000000000
--- a/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/docs/conf.py b/docs/conf.py
-index 094ed23..a58cb85 100644
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -41,7 +41,6 @@ import skbuild
- # Add any Sphinx extension module names here, as strings. They can be
- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
- extensions = [
--    'cmake',
-     'sphinx.ext.autodoc',
-     'sphinx.ext.viewcode',
-     'sphinx_issues'
-@@ -291,4 +290,4 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
- if not on_rtd:  # only import and set the theme if we're building docs locally
-     import sphinx_rtd_theme
-     html_theme = 'sphinx_rtd_theme'
--    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-\ No newline at end of file
-+    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]

diff --git a/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch b/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch
deleted file mode 100644
index fa00556f9ad..00000000000
--- a/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c1677527af3f7afd48ebbe1b2338ac822f64c524 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 19 Jun 2021 19:27:09 +0200
-Subject: [PATCH] fix: fix regex in test_get_python_version for Python 3.10
-
-Fix the regular expression in test_get_python_version to permit
-the minor version to contain more than one digit.  This fixes the test
-on Python 3.10.
----
- tests/test_cmaker.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_cmaker.py b/tests/test_cmaker.py
-index d63059c..52d0028 100644
---- a/tests/test_cmaker.py
-+++ b/tests/test_cmaker.py
-@@ -21,7 +21,7 @@ from . import _tmpdir, get_cmakecache_variables
- 
- 
- def test_get_python_version():
--    assert re.match(r'^[23](\.?)[0-9]$', CMaker.get_python_version())
-+    assert re.match(r'^[23](\.?)\d+$', CMaker.get_python_version())
- 
- 
- def test_get_python_include_dir():
--- 
-2.32.0
-

diff --git a/dev-python/scikit-build/scikit-build-0.11.1.ebuild b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
deleted file mode 100644
index 1d799fe0cd2..00000000000
--- a/dev-python/scikit-build/scikit-build-0.11.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
-HOMEPAGE="https://github.com/scikit-build/scikit-build"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]"
-
-DEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/path-py[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.10.0-docs.patch"
-	"${FILESDIR}"/${P}-py310.patch
-)
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-issues
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# sandbox violations
-		tests/test_hello_cpp.py::test_hello_develop
-		tests/test_issue274_support_default_package_dir.py
-		tests/test_issue274_support_one_package_without_package_dir.py
-		tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
-	)
-	epytest ${deselect[@]/#/--deselect }
-}

[gentoo-commits] repo/gentoo:master commit in: dev-python/scikit-build/files/, dev-python/scikit-build/

[Michał Górny]

commit:     80a44b4c59e1022816ff28156ff60ddaa65b1866
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  6 17:58:28 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar  6 19:01:07 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80a44b4c

dev-python/scikit-build: Backport setuptools-related test fixes

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../files/scikit-build-0.18.1-setuptools-75.patch  | 42 ++++++++++++++++++++++
 dev-python/scikit-build/scikit-build-0.18.1.ebuild |  7 +++-
 2 files changed, 48 insertions(+), 1 deletion(-)

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..b325733a05f9 100644
--- a/dev-python/scikit-build/scikit-build-0.18.1.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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