Merge pull request #2197 from mikedh/release/fstring

Release: fstring

Author: mikedh

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
       run: |
         pip install ruff
     - name: Check Formatting
-      run: ruff .
+      run: ruff check .
   tests:
     name: Run Unit Tests
     needs: formatting

.github/workflows/test.yml

@@ -16,11 +16,9 @@ jobs:
       with:
         python-version: "3.11"
     - name: Install
-      run: pip install ruff black
+      run: pip install ruff
     - name: Run Ruff
-      run: ruff .
-#    - name: Run Black
-#      run: black --check .
+      run: ruff check .
 
   tests:
     name: Run Unit Tests

pyproject.toml

@@ -5,7 +5,7 @@ requires = ["setuptools >= 61.0", "wheel"]
 [project]
 name = "trimesh"
 requires-python = ">=3.7"
-version = "4.2.2"
+version = "4.2.3"
 authors = [{name = "Michael Dawson-Haggerty", email = "mikedh@kerfed.com"}]
 license = {file = "LICENSE.md"}
 description = "Import, export, process, analyze and view triangular meshes."
@@ -129,7 +129,7 @@ select = [
     "E", # style errors
     "F", # flakes
     "I", # import sorting
-    "RUF100", # meta
+    "RUF", # ruff specific rules
     "UP", # upgrade
     "W", # style warnings
     "YTT", # sys.version
@@ -143,6 +143,7 @@ ignore = [
   "E501", # Line too long ({width} > {limit} characters)
   "B904", # raise ... from err
   "B905", # zip() without an explicit strict= parameter
+  "RUF005", # recommends non-type-aware expansion
 ]
 
 # don't allow implicit string concatenation

tests/test_align.py

@@ -37,7 +37,7 @@ def test_align(self):
         unitized = g.trimesh.unitize(vectors)
         for unit_dest, dest in zip(unitized[-10:], vectors[-10:]):
             for unit, vector in zip(unitized, vectors):
-                T, a = align(vector, dest, return_angle=True)
+                T, _a = align(vector, dest, return_angle=True)
                 assert is_rigid(T)
                 assert g.np.isclose(g.np.linalg.det(T), 1.0)
                 # rotate vector with transform
@@ -97,7 +97,7 @@ def test_rigid(self):
 
         vector_1 = g.np.array([7.12106798e-07, -7.43194705e-08, 1.00000000e00])
         vector_2 = g.np.array([0, 0, -1])
-        T, angle = align(vector_1, vector_2, return_angle=True)
+        T, _angle = align(vector_1, vector_2, return_angle=True)
         assert g.np.isclose(g.np.linalg.det(T), 1.0)
 
 

tests/test_creation.py

@@ -267,7 +267,7 @@ def test_triangulate(self):
                     )
                 except BaseException:
                     g.log.error("failed to benchmark triangle", exc_info=True)
-        g.log.info(f"benchmarked triangulation on {len(bench)} polygons: {str(times)}")
+        g.log.info(f"benchmarked triangulation on {len(bench)} polygons: {times!s}")
 
     def test_triangulate_plumbing(self):
         """

tests/test_export.py

@@ -312,7 +312,7 @@ def test_parse_file_args(self):
 
     def test_buffered_random(self):
         """Test writing to non-standard file"""
-        mesh = list(g.get_meshes(1))[0]
+        mesh = next(iter(g.get_meshes(1)))
         with io.BufferedRandom(io.BytesIO()) as rw:
             mesh.export(rw, "STL")
             rw.seek(0)

tests/test_gltf.py

@@ -433,7 +433,7 @@ def to_integer(args):
         )
         assert len(reloaded.geometry) == 1
         # get meshes back
-        sphere_b = list(reloaded.geometry.values())[0]
+        sphere_b = next(iter(reloaded.geometry.values()))
         assert (sphere_b.visual.material.baseColorFactor == (255, 0, 0, 255)).all()
 
     def test_material_hash(self):
@@ -1047,11 +1047,13 @@ def test_unitize_normals_null_values(self):
 
         # Export the mesh
         export = mesh.export(file_type="glb", unitize_normals=True)
-        reimported_mesh = list(
-            g.trimesh.load(
-                g.trimesh.util.wrap_as_stream(export), file_type="glb"
-            ).geometry.values()
-        )[0]
+        reimported_mesh = next(
+            iter(
+                g.trimesh.load(
+                    g.trimesh.util.wrap_as_stream(export), file_type="glb"
+                ).geometry.values()
+            )
+        )
 
         # Check that the normals are still null
         assert g.np.allclose(reimported_mesh.vertex_normals[0], [0, 0, 0])

tests/test_obj.py

@@ -110,7 +110,7 @@ def test_obj_simple_order(self):
         m = g.trimesh.load(file_name, process=False)
         # use trivial loading to compare with fancy performant one
         with open(file_name) as f:
-            f, v, vt = simple_load(f.read())
+            f, v, _vt = simple_load(f.read())
         # trimesh loader should return the same face order
         assert g.np.allclose(f, m.faces)
         assert g.np.allclose(v, m.vertices)
@@ -123,7 +123,7 @@ def test_order_tex(self):
         m = g.trimesh.load(file_name, process=False, maintain_order=True)
         # use trivial loading to compare with fancy performant one
         with open(file_name) as f:
-            f, v, vt = simple_load(f.read())
+            f, v, _vt = simple_load(f.read())
         # trimesh loader should return the same face order
         assert g.np.allclose(f, m.faces)
         assert g.np.allclose(v, m.vertices)
@@ -448,7 +448,7 @@ def test_export_normals(self):
     def test_export_mtl_args(self):
         mesh = g.trimesh.creation.box()
         # check for a crash with no materials defined
-        a, b = g.trimesh.exchange.obj.export_obj(
+        _a, _b = g.trimesh.exchange.obj.export_obj(
             mesh, return_texture=True, mtl_name="hi.mtl"
         )
 

tests/test_packing.py

@@ -72,7 +72,7 @@ def test_obb(self):
         from trimesh.path import packing
 
         nestable = [g.Polygon(i) for i in g.data["nestable"]]
-        inserted, transforms = packing.polygons(nestable)
+        _inserted, _transforms = packing.polygons(nestable)
 
     def test_image(self):
         from trimesh.path import packing
@@ -157,11 +157,11 @@ def test_3D(self):
         )
 
         # try packing these 3D boxes
-        bounds, consume = packing.rectangles_single(e)
+        _bounds, consume = packing.rectangles_single(e)
         assert consume.all()
 
         # try packing these 3D boxes
-        bounds, consume = packing.rectangles_single(e, size=[14, 14, 1])
+        _bounds, consume = packing.rectangles_single(e, size=[14, 14, 1])
         assert not consume.all()
 
     def test_transform(self):

tests/test_paths.py

@@ -282,7 +282,7 @@ def test_section(self):
             )
 
             # Path3D -> Path2D
-            planar, T = section.to_planar()
+            planar, _T = section.to_planar()
 
             # tube should have one closed polygon
             assert len(planar.polygons_full) == 1