Merge remote-tracking branch 'origin/develop' into nick/dset-load-perf

.pre-commit-config.yaml

@@ -10,13 +10,21 @@ repos:
       - id: check-yaml
       - id: check-added-large-files
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.6
+    rev: v0.6.2
     hooks:
       - id: ruff
+        name: ruff check
+        alias: check
+        args: [--fix]
+      - id: ruff
+        name: ruff check imports
+        alias: check-imports
         args: [--fix, --select, I, --exit-non-zero-on-fix]
       - id: ruff-format
+        name: ruff format
+        alias: format
   - repo: https://github.com/RobertCraigie/pyright-python
-    rev: v1.1.374
+    rev: v1.1.377
     hooks:
       - id: pyright
         additional_dependencies: [cython, httpretty, numpy, pytest]

cryosparc/dataset.py

@@ -962,7 +962,7 @@ def __eq__(self, other: object):
         """
         return (
             isinstance(other, type(self))
-            and type(self) == type(other)
+            and type(self) is type(other)
             and len(self) == len(other)
             and self.descr() == other.descr()
             and all(n.array_equal(self[c1], other[c2]) for c1, c2 in zip(self, other))

docs/examples/connect_series_to_class3D.ipynb

@@ -79,11 +79,11 @@
     }
    ],
    "source": [
+    "import zipfile\n",
+    "\n",
     "unzip_path = series_path[:-4]\n",
     "print(unzip_path)\n",
     "\n",
-    "import zipfile\n",
-    "\n",
     "with zipfile.ZipFile(series_path, \"r\") as z:\n",
     "    z.extractall(unzip_path)"
    ]

tests/test_dataset.py

@@ -282,8 +282,8 @@ def test_pickle_unpickle():
 
 
 def test_column_aggregation(t20s_dset):
-    assert type(t20s_dset["uid"]) == Column
-    assert type(n.max(t20s_dset["uid"])) == n.uint64
+    assert type(t20s_dset["uid"]) is Column
+    assert type(n.max(t20s_dset["uid"])) is n.uint64
     assert isinstance(n.mean(t20s_dset["uid"]), n.number)
     assert not isinstance(n.mean(t20s_dset["uid"]), n.ndarray)