Merge branch 'release-v4.7' into develop

Author: nfrasser

.pre-commit-config.yaml

@@ -12,7 +12,7 @@ repos:
       - id: check-yaml
       - id: check-added-large-files
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.9
+    rev: v0.11.2
     hooks:
       - id: ruff
         name: ruff check
@@ -26,7 +26,7 @@ repos:
         name: ruff format
         alias: format
   - repo: https://github.com/RobertCraigie/pyright-python
-    rev: v1.1.396
+    rev: v1.1.398
     hooks:
       - id: pyright
         additional_dependencies:

cryosparc/dataset/__init__.py

@@ -1270,7 +1270,7 @@ def drop_fields(self, names: Union[Collection[str], Callable[[str], bool]], *, c
         Returns:
             Dataset: current dataset or copy with fields removed
         """
-        test = (lambda n: n not in names) if isinstance(names, Collection) else (lambda n: not names(n))  # type: ignore
+        test = (lambda n: n not in names) if isinstance(names, Collection) else (lambda n: not names(n))
         return self.filter_fields(test, copy=copy)
 
     def rename_fields(self, field_map: Union[Dict[str, str], Callable[[str], str]], *, copy: bool = False):
@@ -1286,8 +1286,9 @@ def rename_fields(self, field_map: Union[Dict[str, str], Callable[[str], str]],
         Returns:
             Dataset: current dataset or copy with fields renamed
         """
+        fm: Callable[[str], str]
         if isinstance(field_map, dict):
-            fm = lambda x: field_map.get(x, x)  # noqa
+            fm = lambda x: field_map.get(x, x)  # noqa: E731
         else:
             fm = field_map
 
@@ -1325,7 +1326,7 @@ def rename_prefix(self, old_prefix: str, new_prefix: str, *, copy: bool = False)
         """
         prefix_map = {old_prefix: new_prefix}
 
-        def field_map(name):
+        def field_map(name: str):
             prefix, base = name.split("/")
             return prefix_map.get(prefix, prefix) + "/" + base