rpm/python-meson-python
SHA256
1
0
Fork 0
forked from pool/python-meson-python
Code Pull Requests Activity

- Update meson-subdir-fix.patch to fix the failure for python3.8 and python3.9

Browse Source 
because the meson package is only available for python3.10

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-meson-python?expand=0&rev=6
This commit is contained in:
Daniel Garcia 2022-10-14 12:46:01 +00:00 committed by Git OBS Bridge
parent 168f66e3ac
commit 4bbb6f876e
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
meson-subdir-fix.patch
View File

@ -10,10 +10,10 @@ but it has been.
tests/test_wheel.py | 2 +- tests/test_wheel.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/test_wheel.py b/tests/test_wheel.py Index: meson_python-0.10.0/tests/test_wheel.py
index 818367f..aab0523 100644 ===================================================================
--- a/tests/test_wheel.py --- meson_python-0.10.0.orig/tests/test_wheel.py
+++ b/tests/test_wheel.py +++ meson_python-0.10.0/tests/test_wheel.py
@@ -107,7 +107,7 @@ def test_scipy_like(wheel_scipy_like): @@ -107,7 +107,7 @@ def test_scipy_like(wheel_scipy_like):
# 0.63.2: https://github.com/mesonbuild/meson/pull/10765 # 0.63.2: https://github.com/mesonbuild/meson/pull/10765
# A backport of the fix may land in 0.63.3, if so then remove the version # A backport of the fix may land in 0.63.3, if so then remove the version
@ -23,3 +23,20 @@ index 818367f..aab0523 100644
expecting |= { expecting |= {
'mypkg/submod/__init__.py', 'mypkg/submod/__init__.py',
'mypkg/submod/unknown_filetype.npq', 'mypkg/submod/unknown_filetype.npq',
@@ -120,7 +120,15 @@ def test_scipy_like(wheel_scipy_like):
for item in expecting:
assert item in actual_files
else:
- assert wheel_contents(artifact) == expecting
+ # meson_version is None for python3.8 and python3.9 but the real
+ # version installed is > 0.63.3, so it's possible that these two
+ # files exists in the wheel_contents but not in the expecting:
+ # 'mypkg/submod/__init__.py',
+ # 'mypkg/submod/unknown_filetype.npq',
+ # So we need to compare just the expecting
+ actual_files = wheel_contents(artifact)
+ for item in expecting:
+ assert item in actual_files
name = artifact.parsed_filename
assert name.group('pyver') == PYTHON_TAG

6
python-meson-python.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Oct 14 12:44:56 UTC 2022 - Daniel Garcia <daniel.garcia@suse.com>
- Update meson-subdir-fix.patch to fix the failure for python3.8 and python3.9
because the meson package is only available for python3.10
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 14 08:49:00 UTC 2022 - Markéta Machová <mmachova@suse.com> Fri Oct 14 08:49:00 UTC 2022 - Markéta Machová <mmachova@suse.com>