Sync from SUSE:SLFO:1.1 python-scikit-build revision 7ae2dcf6780db010d4ced2f5ad918dd6

python-scikit-build.changes

@@ -1,21 +1,3 @@
--------------------------------------------------------------------
-Wed Nov 27 15:31:45 UTC 2024 - Ben Greiner <code@bnavigator.de>
-
-- Add scikit-build-pr1120-upddistutils.patch
-  * gh#scikit-build/scikit-build#1120
-
--------------------------------------------------------------------
-Thu Aug 29 13:35:59 UTC 2024 - Ben Greiner <code@bnavigator.de>
-
-- Update to 0.18.1
-  * Support for setuptools 74 in #1116
-  * iOS and Android support by @FeodorFitsner in #1101
-  * Fix for distutils change in #1103
-  * Remove test directives by @s-t-e-v-e-n-k in #1108
-- Drop patches
-  * support-setuptools-72-distutils.patch
-  * support-setuptools-72-test-directives.patch
-
 -------------------------------------------------------------------
 Wed Jul 31 06:14:00 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
 

python-scikit-build.spec

@@ -27,15 +27,17 @@
 
 %{?sle15_python_module_pythons}
 Name:           python-scikit-build%{psuffix}
-Version:        0.18.1
+Version:        0.18.0
 Release:        0
 Summary:        Improved build system generator for Python C/C++/Fortran/Cython extensions
 License:        MIT
 URL:            https://github.com/scikit-build/scikit-build
 Source:         https://files.pythonhosted.org/packages/source/s/scikit-build/scikit_build-%{version}.tar.gz
 Source99:       sample-setup.cfg
-# PATCH-FIX-UPSTREAM scikit-build-pr1120-upddistutils.patch gh#scikit-build/scikit-build#1120
-Patch0:         scikit-build-pr1120-upddistutils.patch
+# PATCH-FIX-UPSTREAM gh#scikit-build/scikit-build#1103
+Patch0:         support-setuptools-72-distutils.patch
+# PATCH-FIX-UPSTREAM gh#scikit-build/scikit-build#1108
+Patch1:         support-setuptools-72-test-directives.patch
 BuildRequires:  %{python_module devel >= 3.8}
 BuildRequires:  %{python_module hatch-fancy-pypi-readme}
 BuildRequires:  %{python_module hatch-vcs}

scikit-build-pr1120-upddistutils.patch

@@ -1,78 +0,0 @@
-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/2] fix(types): Update for newer setuptools
-
-Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
----
- skbuild/platform_specifics/windows.py | 2 +-
- skbuild/setuptools_wrap.py            | 2 +-
- tests/__init__.py                     | 6 +++++-
- 3 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/skbuild/platform_specifics/windows.py b/skbuild/platform_specifics/windows.py
-index 01085a3c..144dec81 100644
---- a/skbuild/platform_specifics/windows.py
-+++ b/skbuild/platform_specifics/windows.py
-@@ -215,7 +215,7 @@ def _get_msvc_compiler_env(vs_version: int, vs_toolset: str | None = None) -> Ca
-         return __get_msvc_compiler_env_cache[cache_key]
- 
-     if hasattr(monkey, "patch_for_msvc_specialized_compiler"):
--        monkey.patch_for_msvc_specialized_compiler()  # type: ignore[no-untyped-call]
-+        monkey.patch_for_msvc_specialized_compiler()
- 
-     vc_dir = find_visual_studio(vs_version)
-     vcvarsall = os.path.join(vc_dir, "vcvarsall.bat")
-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.
-
-From ca5bdb781816540b84a4015e3e62af4e736f7f05 Mon Sep 17 00:00:00 2001
-From: Henry Schreiner <HenrySchreinerIII@gmail.com>
-Date: Tue, 26 Nov 2024 11:06:15 -0500
-Subject: [PATCH 2/2] Update tests/__init__.py
-
----
- tests/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/__init__.py b/tests/__init__.py
-index e3942246..381a67be 100644
---- a/tests/__init__.py
-+++ b/tests/__init__.py
-@@ -218,7 +218,7 @@ def execute_setup_py(project_dir, setup_args, disable_languages_test=False):
-     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"
-+    assert to_clear is not None, "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

support-setuptools-72-distutils.patch

@@ -0,0 +1,23 @@
+From 56ad12fe568675957e87c88a7b9f318b52b07fc4 Mon Sep 17 00:00:00 2001
+From: Henry Schreiner <henryschreineriii@gmail.com>
+Date: Tue, 2 Jul 2024 08:23:03 -0400
+Subject: [PATCH] tests: fix for distutils change
+
+Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
+---
+ tests/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/__init__.py b/tests/__init__.py
+index 00d27289..4f3c9543 100644
+--- a/tests/__init__.py
++++ b/tests/__init__.py
+@@ -215,7 +215,7 @@ 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 = {}  # type: ignore[attr-defined]
++    distutils.dir_util._path_created.clear()  # type: ignore[attr-defined]
+ 
+     # Clear _PYTHON_HOST_PLATFORM to ensure value sets in skbuild.setuptools_wrap.setup() does not
+     # influence other tests.

support-setuptools-72-test-directives.patch

@@ -0,0 +1,60 @@
+From ed6387e8110cd78e4097dbbcf698660738ab05a4 Mon Sep 17 00:00:00 2001
+From: Steve Kowalik <steven@wedontsleep.org>
+Date: Wed, 31 Jul 2024 16:01:32 +1000
+Subject: [PATCH] test: remove test directives
+
+setuptools 72 and above now raise warnings for test_suite and
+tests_require directives in setup.py as support for setup.py test is
+preparing to be removed. These directives have been deprecated for quite
+some time, so just remove them from the sample setup.py files.
+---
+ tests/samples/issue-274-support-default-package-dir/setup.py     | 1 -
+ .../issue-274-support-one-package-without-package-dir/setup.py   | 1 -
+ .../issue-335-support-cmake-source-dir/wrapping/python/setup.py  | 1 -
+ tests/samples/test-filter-manifest/wrapping/python/setup.py      | 1 -
+ 4 files changed, 4 deletions(-)
+
+diff --git a/tests/samples/issue-274-support-default-package-dir/setup.py b/tests/samples/issue-274-support-default-package-dir/setup.py
+index 99f4c361..b880122f 100644
+--- a/tests/samples/issue-274-support-default-package-dir/setup.py
++++ b/tests/samples/issue-274-support-default-package-dir/setup.py
+@@ -10,5 +10,4 @@
+     license="MIT",
+     packages=["hello"],
+     package_dir={"": "src"},
+-    test_suite="hello_tests",
+ )
+diff --git a/tests/samples/issue-274-support-one-package-without-package-dir/setup.py b/tests/samples/issue-274-support-one-package-without-package-dir/setup.py
+index 59864c15..5946573d 100644
+--- a/tests/samples/issue-274-support-one-package-without-package-dir/setup.py
++++ b/tests/samples/issue-274-support-one-package-without-package-dir/setup.py
+@@ -9,5 +9,4 @@
+     author="The scikit-build team",
+     license="MIT",
+     packages=["hello"],
+-    test_suite="hello_tests",
+ )
+diff --git a/tests/samples/issue-335-support-cmake-source-dir/wrapping/python/setup.py b/tests/samples/issue-335-support-cmake-source-dir/wrapping/python/setup.py
+index cb5b9d19..09b23405 100644
+--- a/tests/samples/issue-335-support-cmake-source-dir/wrapping/python/setup.py
++++ b/tests/samples/issue-335-support-cmake-source-dir/wrapping/python/setup.py
+@@ -9,7 +9,6 @@
+     author="The scikit-build team",
+     license="MIT",
+     packages=["hello"],
+-    tests_require=[],
+     setup_requires=[],
+     cmake_source_dir="../../",
+ )
+diff --git a/tests/samples/test-filter-manifest/wrapping/python/setup.py b/tests/samples/test-filter-manifest/wrapping/python/setup.py
+index 642620f8..e1bbb440 100644
+--- a/tests/samples/test-filter-manifest/wrapping/python/setup.py
++++ b/tests/samples/test-filter-manifest/wrapping/python/setup.py
+@@ -14,7 +14,6 @@ def exclude_dev_files(cmake_manifest):
+     author="The scikit-build team",
+     license="MIT",
+     packages=["hello"],
+-    tests_require=[],
+     setup_requires=[],
+     cmake_source_dir="../../",
+     cmake_process_manifest_hook=exclude_dev_files,