forked from pool/python-scikit-build
Accepting request 1190584 from devel:languages:python:numeric
- 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.
OBS-URL: https://build.opensuse.org/request/show/1190584
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-scikit-build?expand=0&rev=23
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
91976f47de
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 31 06:14:00 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
|
||||
|
||||
- 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 <code@bnavigator.de>
|
||||
|
||||
|
||||
@ -34,6 +34,10 @@ 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}
|
||||
@ -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}
|
||||
|
||||
23
support-setuptools-72-distutils.patch
Normal file
23
support-setuptools-72-distutils.patch
Normal file
@ -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.
|
||||
60
support-setuptools-72-test-directives.patch
Normal file
60
support-setuptools-72-test-directives.patch
Normal file
@ -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,
|
||||
Loading…
x
Reference in New Issue
Block a user