From c9ecb4c4abaf49b19d3701fffe81b9a06ba18986 Mon Sep 17 00:00:00 2001 From: Benjamin A. Beasley Date: Nov 11 2023 14:39:39 +0000 Subject: Update to 4.0.4 (close RHBZ#2249167) --- diff --git a/2068.patch b/2068.patch deleted file mode 100644 index 4ab9f62..0000000 --- a/2068.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 bbcd011..3fa8e76 100644 --- a/python-trimesh.spec +++ b/python-trimesh.spec @@ -2,7 +2,7 @@ %bcond skimage 1 Name: python-trimesh -Version: 4.0.3 +Version: 4.0.4 Release: %autorelease Summary: Import, export, process, analyze and view triangular meshes @@ -15,10 +15,6 @@ 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 @@ -151,7 +147,7 @@ Recommends: /usr/bin/openscad %prep -%autosetup -n trimesh-%{version} -p1 +%autosetup -n trimesh-%{version} # Stub out unavailable pyinstrument test dependency; we don’t really need to do # profiling anyway. Note that this does mean that API function diff --git a/sources b/sources index 7637146..a05cebd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (trimesh-4.0.3.tar.gz) = 1eec21e3bcbc80f7ea939b16753ac24d45d750c176044d57a5c2217d46a1559478ab260147e82b1367df7dcb9ecf9aa11dda3a023ebb561f06578672bcc455d5 +SHA512 (trimesh-4.0.4.tar.gz) = 1135b626efc7559c2c127852f2947bf1d659b67a3bb16baf6d3fc795ab81baca1a57f035ce2ff0bdaa61709d0a21a160bbf425717037dd9662295e83894786bc