Release: Unit Hints (#2468)

- Be more flexible in getting unit hints from file names since it was a
little silly that `20mm-xyz-cube` did not resolve as `mm`.
- Apply [actions
guidance](actions/runner-images#13045)
updating to use the `macos-15-intel` image.
- test and fix `trimesh.scene.lighting.autolight` crashing on empty
scenes by checking `scene.bounds is None`
- release #2470 
- add a note about whether or not we should apply the fix from #2457 to
`PBRMaterial.to_simple` using the same conversion function for the
linear `baseColorFactor` to RGB, but don't actually apply the change as
it seems likely to be a source of user confusion.
- add a `Path2D.convex_hull` to match every other geometry method. 
- update `test_scene.py` to pytest style
- release #2472  
- release #2473 
- Add in another `Literal` type for `VoxelizationMethodsType` rather
than a "loose string".

Author: mikedh

.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
-        os: [ubuntu-latest, macos-latest, macos-13, windows-latest]
+        os: [ubuntu-latest, macos-latest, macos-15-intel, windows-latest]
         exclude:
             # windows runners have gotten flaky
           - os: windows-latest

.github/workflows/test.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.8", "3.13"]
-        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-15-intel]
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}

models/pyramids.3mf

@@ -5,7 +5,7 @@ requires = ["setuptools >= 61.0", "wheel"]
 [project]
 name = "trimesh"
 requires-python = ">=3.8"
-version = "4.8.3"
+version = "4.9.0"
 authors = [{name = "Michael Dawson-Haggerty", email = "[email protected]"}]
 license = {file = "LICENSE.md"}
 description = "Import, export, process, analyze and view triangular meshes."

pyproject.toml

@@ -464,6 +464,8 @@ def check_path2D(path):
     assert isinstance(path.identifier_hash, str)
     assert len(path.identifier_hash) == 64, len(path.identifier_hash)
 
+    assert path.convex_hull is not None
+
 
 def scene_equal(a, b):
     """

tests/generic.py

@@ -4,61 +4,67 @@
     import generic as g
 
 
-class MFTest(g.unittest.TestCase):
-    def test_3MF(self):
-        # an assembly with instancing
-        s = g.get_mesh("counterXP.3MF")
-
-        # should be 2 unique meshes
-        assert len(s.geometry) == 2
-        # should be 6 instances around the scene
-        assert len(s.graph.nodes_geometry) == 6
-        assert all(m.is_volume for m in s.geometry.values())
-
-        # a single body 3MF assembly
-        s = g.get_mesh("featuretype.3MF")
-        # should be 2 unique meshes
-        assert len(s.geometry) == 1
-        # should be 6 instances around the scene
-        assert len(s.graph.nodes_geometry) == 1
-
-    def test_units(self):
-        # test our unit conversion function
-        converter = g.trimesh.units.unit_conversion
-        # these are the units listed in the 3MF spec as valid
-        units = ["micron", "millimeter", "centimeter", "inch", "foot", "meter"]
-        # check conversion factor for all valid 3MF units
-        assert all(converter(u, "inches") > 1e-12 for u in units)
-
-    def test_more_units(self):
-        # make sure that units survive down to the mesh
-        s = g.trimesh.load_scene(g.os.path.join(g.dir_models, "featuretype.3MF"))
-        m = next(iter(s.geometry.values()))
-        assert m.units is not None, m.metadata
-
-    def test_kwargs(self):
-        # check if kwargs are properly passed to geometries
-        s = g.get_mesh("P_XPM_0331_01.3mf")
-        assert all(len(v.vertices) == 4 for v in s.geometry.values())
-
-        s = g.get_mesh("P_XPM_0331_01.3mf", process=False)
-        assert all(len(v.vertices) == 5 for v in s.geometry.values())
-
-    def test_names(self):
-        # check if two different objects with the same name are correctly
-        # processed
-        s = g.get_mesh("cube_and_sphere_same_name.3mf")
-        assert len(s.geometry) == 2
-
-    def test_roundtrip(self):
-        if g.sys.version_info < (3, 6):
-            g.log.warning("relies on > Python 3.5")
-            return
-
-        # test a scene round-tripped through the
-        # 3MF exporter and importer
-        s = g.get_mesh("cycloidal.3DXML")
-        assert len(s.geometry) == 13
+def test_3MF():
+    # an assembly with instancing
+    s = g.get_mesh("counterXP.3MF")
+
+    # should be 2 unique meshes
+    assert len(s.geometry) == 2
+    # should be 6 instances around the scene
+    assert len(s.graph.nodes_geometry) == 6
+    assert all(m.is_volume for m in s.geometry.values())
+
+    # a single body 3MF assembly
+    s = g.get_mesh("featuretype.3MF")
+    # should be 2 unique meshes
+    assert len(s.geometry) == 1
+    # should be 6 instances around the scene
+    assert len(s.graph.nodes_geometry) == 1
+
+
+def test_units():
+    # test our unit conversion function
+    converter = g.trimesh.units.unit_conversion
+    # these are the units listed in the 3MF spec as valid
+    units = ["micron", "millimeter", "centimeter", "inch", "foot", "meter"]
+    # check conversion factor for all valid 3MF units
+    assert all(converter(u, "inches") > 1e-12 for u in units)
+
+
+def test_more_units():
+    # make sure that units survive down to the mesh
+    s = g.trimesh.load_scene(g.os.path.join(g.dir_models, "featuretype.3MF"))
+    m = next(iter(s.geometry.values()))
+    assert m.units is not None, m.metadata
+
+
+def test_kwargs():
+    # check if kwargs are properly passed to geometries
+    s = g.get_mesh("P_XPM_0331_01.3mf")
+    assert all(len(v.vertices) == 4 for v in s.geometry.values())
+
+    s = g.get_mesh("P_XPM_0331_01.3mf", process=False)
+    assert all(len(v.vertices) == 5 for v in s.geometry.values())
+
+
+def test_names():
+    # check if two different objects with the same name are correctly
+    # processed
+    s = g.get_mesh("cube_and_sphere_same_name.3mf")
+    assert len(s.geometry) == 2
+
+
+def test_roundtrip():
+    if g.sys.version_info < (3, 6):
+        g.log.warning("relies on > Python 3.5")
+        return
+
+    # test a scene round-tripped through the
+    # 3MF exporter and importer
+
+    for name, count in [("cycloidal.3DXML", 13), ("pyramids.3mf", 6)]:
+        s = g.get_mesh(name)
+        assert len(s.geometry) == count
 
         # export and reload
         r = g.trimesh.load(

tests/test_3mf.py

@@ -207,5 +207,6 @@ def test_multiple_difference():
         # should have done the diff
         assert np.allclose(diff_base.extents, [1.5, 1.5, 2.0], atol=1e-8)
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     test_boolean()

tests/test_boolean.py

@@ -1122,6 +1122,18 @@ def test_no_indices(self):
         mesh = g.get_mesh("Mesh_PrimitiveMode_04.gltf")
         assert len(mesh.triangles) == 2
 
+    def test_simple_material_conversion(self):
+        # make sure the name is preserved for a material
+        mesh = next(iter(g.get_mesh("Duck.glb").geometry.values()))
+
+        mat = mesh.visual.material
+        assert isinstance(mat, g.trimesh.visual.material.PBRMaterial)
+        assert isinstance(mat.name, str)
+        assert len(mat.name) > 0
+
+        simple = mesh.visual.material.to_simple()
+        assert simple.name == mesh.visual.material.name
+
 
 if __name__ == "__main__":
     g.trimesh.util.attach_to_log()

tests/test_gltf.py

@@ -342,6 +342,7 @@ def test_multi_nodupe():
         for L in mtl["material.mtl"].decode("utf-8").split("\n")
         if "newmtl" in L
     ]
+
     # there should be 5 unique material names
     assert len(set(mtl_names)) == 5
 
@@ -563,4 +564,4 @@ def test_obj_quad_uv():
 
 if __name__ == "__main__":
     # test_material_name()
-    test_vertex_color()
+    test_multi_nodupe()