diff --git a/python-scikit-build.changes b/python-scikit-build.changes index d5bde59..cecc166 100644 --- a/python-scikit-build.changes +++ b/python-scikit-build.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Aug 29 13:35:59 UTC 2024 - Ben Greiner + +- 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 diff --git a/python-scikit-build.spec b/python-scikit-build.spec index bc66ef5..461e29f 100644 --- a/python-scikit-build.spec +++ b/python-scikit-build.spec @@ -27,17 +27,13 @@ %{?sle15_python_module_pythons} Name: python-scikit-build%{psuffix} -Version: 0.18.0 +Version: 0.18.1 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 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} diff --git a/scikit_build-0.18.0.tar.gz b/scikit_build-0.18.0.tar.gz deleted file mode 100644 index 682ebfa..0000000 --- a/scikit_build-0.18.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71a13af467d1a38510c3494786e2edb73ead53ea922bde6e519dc5372aa65096 -size 273824 diff --git a/scikit_build-0.18.1.tar.gz b/scikit_build-0.18.1.tar.gz new file mode 100644 index 0000000..4d2d225 --- /dev/null +++ b/scikit_build-0.18.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4152ac5a084d499c28a7797be0628d8366c336e2fb0e1a063eb32e55efcb8e7 +size 274171 diff --git a/support-setuptools-72-distutils.patch b/support-setuptools-72-distutils.patch deleted file mode 100644 index 9588862..0000000 --- a/support-setuptools-72-distutils.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index 7edd701..0000000 --- a/support-setuptools-72-test-directives.patch +++ /dev/null @@ -1,60 +0,0 @@ -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,