pool/python-meson-python
SHA256
9
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1010928 from devel:languages:python

Browse Source 
- 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
- Add meson-subdir-fix.patch to fix the failure with new meson

OBS-URL: https://build.opensuse.org/request/show/1010928
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-meson-python?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger
2022-10-18 10:44:10 +00:00
committed by Git OBS Bridge
parent a61b4069b6 4bbb6f876e
commit ab608e384b
3 changed files with 55 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
meson-subdir-fix.patch Normal file
View File

@@ -0,0 +1,42 @@
From f51fcafb20e20a8a724a2b65f49670a74fe7d8f2 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Thu, 6 Oct 2022 20:18:43 +0200
Subject: [PATCH] TST: update the test for `install_subdir` for fix in meson
0.63.3
We weren't sure if the fix we needed was getting backported,
but it has been.
---
tests/test_wheel.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: meson_python-0.10.0/tests/test_wheel.py
===================================================================
--- meson_python-0.10.0.orig/tests/test_wheel.py
+++ meson_python-0.10.0/tests/test_wheel.py
@@ -107,7 +107,7 @@ def test_scipy_like(wheel_scipy_like):
# 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
# check here and add the two expected files unconditionally.
- if meson_version and meson_version >= '0.63.99':
+ if meson_version and meson_version >= '0.63.3':
expecting |= {
'mypkg/submod/__init__.py',
'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

11
python-meson-python.changes
View File

@@ -1,3 +1,14 @@
-------------------------------------------------------------------
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>
- Add meson-subdir-fix.patch to fix the failure with new meson
-------------------------------------------------------------------
Tue Oct 11 09:01:00 UTC 2022 - Ben Greiner <code@bnavigator.de>

2
python-meson-python.spec
View File

@@ -25,6 +25,8 @@ URL: https://github.com/FFY00/meson-python
Source: https://files.pythonhosted.org/packages/source/m/meson_python/meson_python-%{version}.tar.gz
# PATCH-FEATURE-OPENSUSE mesonpy-trim-deps.patch code@bnavigator.de
Patch1: mesonpy-trim-deps.patch
# PATCH-FIX-UPSTREAM https://github.com/FFY00/meson-python/commit/f51fcafb20e20a8a724a2b65f49670a74fe7d8f2 TST: update the test for install_subdir for fix in meson 0.63.3
Patch2: meson-subdir-fix.patch
BuildRequires: %{python_module base >= 3.7}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module pyproject-metadata >= 0.6.1}