Merge branch 'main' into cli

Author: tlambert03

.github/workflows/ci.yml

@@ -15,9 +15,18 @@ jobs:
   check-manifest:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - run: pipx run check-manifest
 
+  pyright:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v6
+        with:
+          enable-cache: true
+      - run: uv run pyright
+
   test:
     name: ${{ matrix.os }} py${{ matrix.python-version }} ${{ matrix.gui }} ${{ matrix.canvas }}
     runs-on: ${{ matrix.os }}
@@ -85,7 +94,7 @@ jobs:
             canvas: pygfx
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up uv
         uses: astral-sh/setup-uv@v6
         with:
@@ -154,7 +163,7 @@ jobs:
         python-version: ["3.10", "3.12"]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up uv
         uses: astral-sh/setup-uv@v6
         with:
@@ -193,7 +202,7 @@ jobs:
   test-docs:
     runs-on: macos-latest # nicer screenshots
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: astral-sh/setup-uv@v6
       - name: 📚 Build docs
         run: uv run --group docs mkdocs build --strict
@@ -213,7 +222,7 @@ jobs:
       contents: write
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

.github/workflows/deploy_docs.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: macos-latest  # nicer screenshots
     if: github.repository == 'pyapp-kit/ndv'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - uses: astral-sh/setup-uv@v6

.github_changelog_generator

@@ -3,4 +3,4 @@ project=ndv
 issues=false
 exclude-labels=duplicate,question,invalid,wontfix,hide
 add-sections={"tests":{"prefix":"**Tests & CI:**","labels":["tests"]}, "documentation":{"prefix":"**Documentation:**", "labels":["documentation"]}}
-exclude-tags-regex=.*rc
+exclude-tags-regex=.*rc

.pre-commit-config.yaml

@@ -4,26 +4,36 @@ ci:
   autoupdate_commit_msg: "ci(pre-commit.ci): autoupdate"
 
 repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: trailing-whitespace
+        exclude: ".*\\.md"
+      - id: end-of-file-fixer
+      - id: check-yaml
+        args: ["--unsafe"]
+      - id: check-added-large-files
+
   - repo: https://github.com/abravalheri/validate-pyproject
     rev: v0.24.1
     hooks:
       - id: validate-pyproject
 
-  - repo: https://github.com/crate-ci/typos
-    rev: v1.32.0
+  - repo: https://github.com/adhtruong/mirrors-typos
+    rev: v1.35.5
     hooks:
       - id: typos
         args: [--force-exclude] # omitting --write-changes
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.8
+    rev: v0.12.10
     hooks:
-      - id: ruff
+      - id: ruff-check
         args: [--fix, --unsafe-fixes]
       - id: ruff-format
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.15.0
+    rev: v1.17.1
     hooks:
       - id: mypy
         files: "^src/"
@@ -32,3 +42,17 @@ repos:
           - pydantic
           - psygnal
           - IPython
+          - types-wxpython
+          - qtpy
+          - git+https://github.com/tlambert03/PyQt6-stubs.git@v6.7.3
+
+  - repo: local
+    hooks:
+      - id: pyright
+        stages: [manual]
+        exclude: "^docs/"
+        name: pyright
+        language: system
+        types_or: [python, pyi]
+        require_serial: true
+        entry: uv run pyright

Makefile

@@ -40,5 +40,5 @@ docs:
 docs-serve:
 	uv run --group docs mkdocs serve --no-strict
 
-lint: 
-	uv run pre-commit run --all-files
+lint:
+	uv run pre-commit run --all-files

docs/css/material.css

@@ -2,25 +2,25 @@
 .md-main__inner {
     margin-bottom: 1.5rem;
   }
-  
+
   /* Custom admonition: preview */
   :root {
     --md-admonition-icon--preview: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M15.5 12a3.5 3.5 0 1 1-7 0 3.5 3.5 0 0 1 7 0Z"/><path d="M12 3.5c3.432 0 6.124 1.534 8.054 3.241 1.926 1.703 3.132 3.61 3.616 4.46a1.6 1.6 0 0 1 0 1.598c-.484.85-1.69 2.757-3.616 4.461-1.929 1.706-4.622 3.24-8.054 3.24-3.432 0-6.124-1.534-8.054-3.24C2.02 15.558.814 13.65.33 12.8a1.6 1.6 0 0 1 0-1.598c.484-.85 1.69-2.757 3.616-4.462C5.875 5.034 8.568 3.5 12 3.5ZM1.633 11.945a.115.115 0 0 0-.017.055c.001.02.006.039.017.056.441.774 1.551 2.527 3.307 4.08C6.691 17.685 9.045 19 12 19c2.955 0 5.31-1.315 7.06-2.864 1.756-1.553 2.866-3.306 3.307-4.08a.111.111 0 0 0 .017-.056.111.111 0 0 0-.017-.056c-.441-.773-1.551-2.527-3.307-4.08C17.309 6.315 14.955 5 12 5 9.045 5 6.69 6.314 4.94 7.865c-1.756 1.552-2.866 3.306-3.307 4.08Z"/></svg>');
   }
-  
+
   .md-typeset .admonition.preview,
   .md-typeset details.preview {
     border-color: rgb(220, 139, 240);
   }
-  
+
   .md-typeset .preview>.admonition-title,
   .md-typeset .preview>summary {
     background-color: rgba(142, 43, 155, 0.1);
   }
-  
+
   .md-typeset .preview>.admonition-title::before,
   .md-typeset .preview>summary::before {
     background-color: rgb(220, 139, 240);
     -webkit-mask-image: var(--md-admonition-icon--preview);
     mask-image: var(--md-admonition-icon--preview);
-  }
+  }

docs/hooks.py

@@ -146,8 +146,8 @@ def generate_screenshots(script: Path) -> Iterable[tuple[bytes, Mode]]:
 
     def _start_app(*_: Any) -> QCoreApplication:
         if (app := QApplication.instance()) is None:
-            QApplication._APP = app = original_new(*_)  # type: ignore
-            QApplication.__init__(app, [])  # type: ignore
+            QApplication._APP = app = original_new(*_)  # type: ignore[attr-defined]
+            QApplication.__init__(app, [])  # type: ignore[arg-type]
         return app
 
     patch_app = patch.object(QApplication, "__new__", _start_app)

examples/cookbook/microscope_dashboard.py

@@ -14,6 +14,8 @@
 - move the stage in the x and y directions.
 """
 
+from __future__ import annotations
+
 from typing import Any, cast
 
 import astropy.units as u

examples/numpy_arr.py

@@ -14,4 +14,4 @@
     print(e)
     img = ndv.data.nd_sine_wave((10, 3, 8, 512, 512))
 
-viewer = ndv.imshow(img)
+viewer = ndv.imshow(img, current_index={0: 30}, channel_mode="composite")

examples/xarray_arr.py

@@ -15,4 +15,6 @@
 import ndv
 
 da = xr.tutorial.open_dataset("air_temperature").air
-ndv.imshow(da, default_lut={"cmap": "thermal"}, visible_axes=("lat", "lon"))
+ndv.imshow(
+    da.astype("float32"), default_lut={"cmap": "thermal"}, visible_axes=("lat", "lon")
+)