File meson-subdir-fix.patch of Package python-meson-python

Overview Repositories Revisions Requests Users Attributes Meta

File meson-subdir-fix.patch of Package python-meson-python (Revision d4e40cbcaaded8f70e7f453ab3cc88ca)

Currently displaying revision d4e40cbcaaded8f70e7f453ab3cc88ca , Show latest

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

Places

File meson-subdir-fix.patch of Package python-meson-python (Revision d4e40cbcaaded8f70e7f453ab3cc88ca)

Places