From d05d39f86f1c3f57f929b7e44412a00e524c78c8aded48b1159f448dc198d301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 13 Sep 2024 16:25:55 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main python-scikit-build revision 7ae2dcf6780db010d4ced2f5ad918dd6 --- python-scikit-build.changes | 45 ++++++++++++++++ python-scikit-build.spec | 15 ++++-- scikit_build-0.17.6.tar.gz | 3 -- scikit_build-0.18.0.tar.gz | 3 ++ support-setuptools-72-distutils.patch | 23 ++++++++ support-setuptools-72-test-directives.patch | 60 +++++++++++++++++++++ 6 files changed, 141 insertions(+), 8 deletions(-) delete mode 100644 scikit_build-0.17.6.tar.gz create mode 100644 scikit_build-0.18.0.tar.gz create mode 100644 support-setuptools-72-distutils.patch create mode 100644 support-setuptools-72-test-directives.patch diff --git a/python-scikit-build.changes b/python-scikit-build.changes index 6eda582..d5bde59 100644 --- a/python-scikit-build.changes +++ b/python-scikit-build.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Wed Jul 31 06:14:00 UTC 2024 - Steve Kowalik + +- Add patch support-setuptools-72-distutils.patch: + * Don't monkey patch distutils incorrectly. +- Add patch support-setuptools-72-test-directives.patch: + * Remove test{_suite,s_require} directives. + +------------------------------------------------------------------- +Thu Jul 11 09:01:25 UTC 2024 - Ben Greiner + +- Update to 0.18.0 + ## Bug fixes + * Support MSVC 17.10 in #1081 + * CMake 3.5+ requirement in #1095 + * Support CPython 3.13 with windows lib finding fix in #1094 + * Don't die on PermissionError during chmod by @mweinelt in #1073 + * Remove usage of deprecated distutils in cmake files by + @hmaarrfk in #1032 + * Use first available option for vswhere output by @ZzEeKkAa in + #1030 + ## Testing + * Support setuptools 69.3.0 changes in two tests by + @s-t-e-v-e-n-k in #1087 + * Use uv in a few places in #1092 + ## Miscellaneous + * Clean up pylint in #1017 + * Fix mypy type ignores for new setuptools types in #1082 + * Move to Ruff-format in #1035 + * Remove pkg_resources and test command in #1014 + * Ruff moved to astral-sh in #1007 + * Target-version no longer needed by Black or Ruff in #1008 + * Update ruff and fix warnings in #1060 + * Use 2x faster black mirror in #1021 + * Group dependabot updates in #1054 + * macos-latest is changing to macos-14 ARM runners in #1083 + * Skip win PyPy PEP 518 in #1091 +- Drop support-setuptools-69-3.patch + +------------------------------------------------------------------- +Mon Jun 3 06:10:14 UTC 2024 - Steve Kowalik + +- Add patch support-setuptools-69-3.patch: + * Support changes introduced by setuptools 69.3.0. + ------------------------------------------------------------------- Sat Jul 1 13:49:46 UTC 2023 - Ben Greiner diff --git a/python-scikit-build.spec b/python-scikit-build.spec index c49e952..bc66ef5 100644 --- a/python-scikit-build.spec +++ b/python-scikit-build.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package python-scikit-build # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,14 +27,18 @@ %{?sle15_python_module_pythons} Name: python-scikit-build%{psuffix} -Version: 0.17.6 +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 -BuildRequires: %{python_module devel >= 3.7} +# 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} BuildRequires: %{python_module hatchling} @@ -42,7 +46,7 @@ BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools >= 42.0.0} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: cmake +Requires: cmake >= 3.5 Requires: python-distro Requires: python-packaging Requires: python-setuptools >= 42.0.0 @@ -58,6 +62,7 @@ Requires: python-tomli BuildRequires: %{python_module Cython >= 0.25.1} BuildRequires: %{python_module build >= 0.7} BuildRequires: %{python_module importlib-metadata if %python-base < 3.8} +BuildRequires: %{python_module numpy-devel >= 1.21} BuildRequires: %{python_module pytest >= 6.0.0} BuildRequires: %{python_module pytest-mock >= 1.10.4} BuildRequires: %{python_module requests} diff --git a/scikit_build-0.17.6.tar.gz b/scikit_build-0.17.6.tar.gz deleted file mode 100644 index 7d7b3b4..0000000 --- a/scikit_build-0.17.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b51a51a36b37c42650994b5047912f59b22e3210b23e321f287611f9ef6e5c9d -size 272208 diff --git a/scikit_build-0.18.0.tar.gz b/scikit_build-0.18.0.tar.gz new file mode 100644 index 0000000..682ebfa --- /dev/null +++ b/scikit_build-0.18.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71a13af467d1a38510c3494786e2edb73ead53ea922bde6e519dc5372aa65096 +size 273824 diff --git a/support-setuptools-72-distutils.patch b/support-setuptools-72-distutils.patch new file mode 100644 index 0000000..9588862 --- /dev/null +++ b/support-setuptools-72-distutils.patch @@ -0,0 +1,23 @@ +From 56ad12fe568675957e87c88a7b9f318b52b07fc4 Mon Sep 17 00:00:00 2001 +From: Henry Schreiner +Date: Tue, 2 Jul 2024 08:23:03 -0400 +Subject: [PATCH] tests: fix for distutils change + +Signed-off-by: Henry Schreiner +--- + 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. diff --git a/support-setuptools-72-test-directives.patch b/support-setuptools-72-test-directives.patch new file mode 100644 index 0000000..7edd701 --- /dev/null +++ b/support-setuptools-72-test-directives.patch @@ -0,0 +1,60 @@ +From ed6387e8110cd78e4097dbbcf698660738ab05a4 Mon Sep 17 00:00:00 2001 +From: Steve Kowalik +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,