Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-meson-python for
openSUSE:Factory checked in at 2022-10-18 12:44:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-meson-python (Old)
and /work/SRC/openSUSE:Factory/.python-meson-python.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-meson-python"
Tue Oct 18 12:44:10 2022 rev:3 rq:1010928 version:0.10.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-meson-python/python-meson-python.changes
2022-10-11 18:05:56.762123238 +0200
+++
/work/SRC/openSUSE:Factory/.python-meson-python.new.2275/python-meson-python.changes
2022-10-18 12:44:12.437615465 +0200
@@ -1,0 +2,11 @@
+Fri Oct 14 12:44:56 UTC 2022 - Daniel Garcia <[email protected]>
+
+- 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?? <[email protected]>
+
+- Add meson-subdir-fix.patch to fix the failure with new meson
+
+-------------------------------------------------------------------
New:
----
meson-subdir-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-meson-python.spec ++++++
--- /var/tmp/diff_new_pack.p5FnYA/_old 2022-10-18 12:44:12.881616476 +0200
+++ /var/tmp/diff_new_pack.p5FnYA/_new 2022-10-18 12:44:12.885616485 +0200
@@ -25,6 +25,8 @@
Source:
https://files.pythonhosted.org/packages/source/m/meson_python/meson_python-%{version}.tar.gz
# PATCH-FEATURE-OPENSUSE mesonpy-trim-deps.patch [email protected]
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}
++++++ meson-subdir-fix.patch ++++++
>From f51fcafb20e20a8a724a2b65f49670a74fe7d8f2 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <[email protected]>
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
