Update pre-commit hooks

Author: jl-wynen

.pre-commit-config.yaml

@@ -16,22 +16,22 @@ repos:
         args: [ --markdown-linebreak-ext=md ]
         exclude: '\.svg'
   - repo: https://github.com/kynan/nbstripout
-    rev: 0.7.1
+    rev: 0.8.1
     hooks:
       - id: nbstripout
         types: [ "jupyter" ]
         args: [ "--drop-empty-cells",
                 "--extra-keys 'metadata.language_info.version cell.metadata.jp-MarkdownHeadingCollapsed cell.metadata.pycharm'" ]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.0
+    rev: v0.9.10
     hooks:
       - id: ruff
         args: [ --fix ]
         types_or: [ python, pyi, jupyter ]
       - id: ruff-format
         types_or: [ python, pyi ]
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
       - id: codespell
         additional_dependencies:
@@ -47,7 +47,7 @@ repos:
       - id: rst-inline-touching-normal
       - id: text-unicode-replacement-char
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.3
+    rev: v1.7.7
     hooks:
       - id: actionlint
         # Disable because of false-positive SC2046

src/scippneutron/__init__.py

@@ -23,7 +23,7 @@
 
 import lazy_loader as lazy
 
-submodules = ['atoms' 'chopper', 'io', 'conversion']
+submodules = ['atomschopper', 'io', 'conversion']
 
 __getattr__, __dir__, __all__ = lazy.attach(
     __name__,

src/scippneutron/chopper/_svg.py

@@ -24,7 +24,7 @@
 """
 )
 _DISK_TEMPLATE = Template(
-    '<path d="${path}" fill="#e0e0e0" ' 'stroke="#a0a0a0" stroke-width="2"/>'
+    '<path d="${path}" fill="#e0e0e0" stroke="#a0a0a0" stroke-width="2"/>'
 )
 _EDGE_MARK_TEMPLATE = Template(
     '<path d="${path}" stroke="#707070" stroke-width="2" stroke-dasharray="5,5"/>'
@@ -48,7 +48,7 @@ def _rotation_arrow(*, image_size: int, clockwise: bool) -> str:
     # The arrow was drawn with Inkscape at an image size of 400.
     s = image_size / 400
     flip, shift = (-1, image_size) if clockwise else (1, 0)
-    return f"""<g id="rotation-arrow" transform="matrix({flip*s},0,0,{s},{shift},20)">
+    return f"""<g id="rotation-arrow" transform="matrix({flip * s},0,0,{s},{shift},20)">
 <path fill="#606060"
  d="m 190.46289,4.140625 c -19.2285,0.9736749 -38.20846,4.7790001 -56.32617,11.292969 l 0.89453,2.490234 C 152.90409,11.497902 171.62709,7.7437179 190.5957,6.7832031 Z"/>
 <path fill="#606060" stroke-linecap="round"
@@ -228,7 +228,7 @@ def trace_disk() -> tuple[list[str], list[tuple[str, dict[str, str]]]]:
     ]
     if (beam_position := chopper.beam_position) is not None:
         elements.append(beam_pos(beam_position))
-    elements.append(f'<circle cx="{image_size/2}" cy="{image_size/2}" r="5"/>')
+    elements.append(f'<circle cx="{image_size / 2}" cy="{image_size / 2}" r="5"/>')
     return _CHOPPER_TEMPLATE.substitute(
         image_size=image_size, elements="\n".join(elements)
     )

src/scippneutron/chopper/filtering.py

@@ -53,7 +53,7 @@ def find_plateaus(
     """
     if data.ndim != 1:
         raise NotImplementedError(
-            "find_plateaus only supports 1-dimensional data, " f"got {data.ndim} dims"
+            f"find_plateaus only supports 1-dimensional data, got {data.ndim} dims"
         )
     if not sc.issorted(data.coords[data.dim], data.dim, order="ascending"):
         raise sc.CoordError(

src/scippneutron/io/cif.py

@@ -571,7 +571,7 @@ def __setitem__(self, name: str, value: sc.Variable) -> None:
         """
         if value.ndim != 1:
             raise sc.DimensionError(
-                "CIF loops can only contain 1d variables, got " f"{value.ndim} dims"
+                f"CIF loops can only contain 1d variables, got {value.ndim} dims"
             )
         if self._columns:
             existing = next(iter(self._columns.values())).sizes
@@ -732,7 +732,7 @@ def write(self, f: TextIO) -> None:
     'ess',
     'isis',
     'j-parc',
-    'lansce' 'sinq',
+    'lanscesinq',
     'sns',
 }
 
@@ -880,8 +880,7 @@ def _reduced_powder_coord(data) -> tuple[str, sc.Variable]:
     coord = data.coords[data.dim]
     if coord.unit != unit:
         raise sc.UnitError(
-            f'Incorrect unit for powder coordinate {name}: {coord.unit} '
-            f'expected {unit}'
+            f'Incorrect unit for powder coordinate {name}: {coord.unit} expected {unit}'
         )
     return name, coord
 

src/scippneutron/mantid.py

@@ -435,11 +435,11 @@ def _get_dtype_from_values(values, coerce_floats_to_ints):
                 dtype = sc.DType.float64
             else:
                 raise RuntimeError(
-                    "Cannot handle the dtype that this " "workspace has on Axis 1."
+                    "Cannot handle the dtype that this workspace has on Axis 1."
                 )
         else:
             raise RuntimeError(
-                "Axis 1 of this workspace has no values. " "Cannot determine dtype."
+                "Axis 1 of this workspace has no values. Cannot determine dtype."
             )
     return dtype
 

tests/mantid_test.py

@@ -311,9 +311,9 @@ def check_monitor_metadata(monitor):
         # no need for these, and it avoids duplication:
         assert 'detector_info' not in monitor.coords
         assert 'sample' not in monitor.coords
-        assert (
-            'SampleTemp' not in monitor.coords
-        ), "Expect run logs not be duplicated in monitor workspaces"
+        assert 'SampleTemp' not in monitor.coords, (
+            "Expect run logs not be duplicated in monitor workspaces"
+        )
 
     def test_Workspace2D_with_separate_monitors(self):
         from mantid.simpleapi import mtd
@@ -530,9 +530,9 @@ def test_convert_array_run_log(self):
         # Given a Mantid workspace with a run log
         target = mantid.CloneWorkspace(self.base_event_ws)
         log_name = "SampleTemp"
-        assert target.run().hasProperty(
-            log_name
-        ), f'Expected input workspace to have a {log_name} run log'
+        assert target.run().hasProperty(log_name), (
+            f'Expected input workspace to have a {log_name} run log'
+        )
 
         # When the workspace is converted to a scipp data array
         dg = scn.mantid.convert_EventWorkspace_to_data_group(target, False)
@@ -555,9 +555,9 @@ def test_convert_scalar_run_log(self):
         # Given a Mantid workspace with a run log
         target = mantid.CloneWorkspace(self.base_event_ws)
         log_name = "start_time"
-        assert target.run().hasProperty(
-            log_name
-        ), f'Expected input workspace to have a {log_name} run log'
+        assert target.run().hasProperty(log_name), (
+            f'Expected input workspace to have a {log_name} run log'
+        )
 
         # When the workspace is converted to a scipp data array
         dg = scn.mantid.convert_EventWorkspace_to_data_group(target, False)