diff --git a/2068.patch b/2068.patch new file mode 100644 index 0000000..4ab9f62 --- /dev/null +++ b/2068.patch @@ -0,0 +1,30 @@ +From a9c42af05e574b6e4a3ee3edd5ac70894cfdde48 Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Wed, 8 Nov 2023 08:41:05 -0500 +Subject: [PATCH] Add missing engine keyword in boolean test_multiple + +--- + tests/test_boolean.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/test_boolean.py b/tests/test_boolean.py +index 45e0eda02..bdb50ef7c 100644 +--- a/tests/test_boolean.py ++++ b/tests/test_boolean.py +@@ -70,14 +70,14 @@ def test_multiple(self): + """ + Make sure boolean operations work on multiple meshes. + """ +- for _engine, exists in engines: ++ for engine, exists in engines: + if not exists: + continue + a = g.trimesh.primitives.Sphere(center=[0, 0, 0]) + b = g.trimesh.primitives.Sphere(center=[0, 0, 0.75]) + c = g.trimesh.primitives.Sphere(center=[0, 0, 1.5]) + +- r = g.trimesh.boolean.union([a, b, c]) ++ r = g.trimesh.boolean.union([a, b, c], engine=engine) + + assert r.is_volume + assert r.body_count == 1 diff --git a/python-trimesh.spec b/python-trimesh.spec index 5b36cdd..bbcd011 100644 --- a/python-trimesh.spec +++ b/python-trimesh.spec @@ -2,7 +2,7 @@ %bcond skimage 1 Name: python-trimesh -Version: 4.0.2 +Version: 4.0.3 Release: %autorelease Summary: Import, export, process, analyze and view triangular meshes @@ -15,6 +15,10 @@ License: MIT AND BSD-3-Clause AND Zlib URL: https://trimsh.org Source: https://github.com/mikedh/trimesh/archive/%{version}/trimesh-%{version}.tar.gz +# Add missing engine keyword in boolean test_multiple +# https://github.com/mikedh/trimesh/pull/2068 +Patch: https://github.com/mikedh/trimesh/pull/2068.patch + # The combination of an arched package with only noarch binary packages makes # it easier for us to detect arch-dependent test failures, since the tests will # always be run on every platform, and easier for us to skip failing tests if @@ -147,7 +151,7 @@ Recommends: /usr/bin/openscad %prep -%autosetup -n trimesh-%{version} +%autosetup -n trimesh-%{version} -p1 # Stub out unavailable pyinstrument test dependency; we don’t really need to do # profiling anyway. Note that this does mean that API function @@ -181,6 +185,7 @@ EOF # was retired; the current version was 4.x. # glooey: not yet packaged, https://github.com/kxgames/glooey; needs fonts # that are not currently packaged unbundled from its assets +# manifold3d: not yet packaged, https://github.com/elalish/manifold/ # meshio: not yet packaged, https://github.com/nschloe/meshio # pymeshlab: not yet packaged, https://github.com/cnr-isti-vclab/PyMeshLab/; # bundles MeshLab, which is a nontrivial package that has its own @@ -207,6 +212,7 @@ for pkg in \ coveralls \ embreex \ glooey \ + manifold3d \ meshio \ mypy \ pyinstrument \ diff --git a/sources b/sources index 0afe9d3..7637146 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (trimesh-4.0.2.tar.gz) = 7c0c8cbf40f03f4fd92156306f0a0d4d0a1dbf774c9a1743d63d82be2264b50915f2f6ea2cdebd0e81390e7f96acb47eca9980f3829311ec027706ef1cc143c0 +SHA512 (trimesh-4.0.3.tar.gz) = 1eec21e3bcbc80f7ea939b16753ac24d45d750c176044d57a5c2217d46a1559478ab260147e82b1367df7dcb9ecf9aa11dda3a023ebb561f06578672bcc455d5