Merge branch 'main' into pre-commit-ci-update-config

.github/workflows/ci.yml

@@ -53,11 +53,12 @@ jobs:
           coverage run --source=npe2 -m pytest --color yes
 
       - name: Upload coverage as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: coverage reports
+          name: coverage reports ${{ matrix.platform }} py ${{ matrix.python-version }} ${{ (matrix.pydantic == 'pydantic<2' && 'pydantic_lt_2') || 'pydantic_gt_2' }}
           path: |
             ./.coverage.*
+          include-hidden-files: true
 
   test_napari:
     name: napari tests
@@ -124,10 +125,11 @@ jobs:
           pip install codecov
 
       - name: Download coverage data
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: coverage reports
+          pattern: coverage reports*
           path: coverage
+          merge-multiple: true
 
       - name: combine coverage data
         run: |

.github/workflows/update_changelog.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: "✏️ Generate release changelog"
-        uses: heinrichreimer/github-changelog-generator-action@v2.3
+        uses: heinrichreimer/github-changelog-generator-action@v2.4
         with:
           futureRelease: ${{ github.event.inputs.next_tag }}
           token: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -9,9 +9,9 @@ see also https://github.com/napari/napari/issues/3115
 
 ## Documentation
 
-For documentation on authoring npe2 plugins, see the [napari plugin docs](https://napari.org/plugins/index.html).  These include:
-- the [manifest reference](https://napari.org/plugins/manifest.html)
-- the [contribution guide](https://napari.org/plugins/contributions.html)
+For documentation on authoring npe2 plugins, see the [napari plugin docs](https://napari.org/stable/plugins/index.html).  These include:
+- the [manifest reference](https://napari.org/stable/plugins/technical_references/manifest.html)
+- the [contribution guide](https://napari.org/stable/plugins/building_a_plugin/guides.html)
 
 ## Command line tool
 

src/npe2/manifest/schema.py

@@ -29,7 +29,7 @@
 logger = getLogger(__name__)
 
 
-SCHEMA_VERSION = "0.2.0"
+SCHEMA_VERSION = "0.2.1"
 ENTRY_POINT = "napari.manifest"
 NPE1_ENTRY_POINT = "napari.plugin"
 
@@ -55,6 +55,8 @@ class Category(str, Enum):
     # Tools that extract measurements (i.e. into tabular, graph, or other data formats),
     # such as region properties, etc...
     Measurement = "Measurement"
+    # tools that allow registration/alignment between different layers/datasets
+    Registration = "Registration"
     # tools that identify objects and/or boundaries in datasets
     # (including, but not limited to, images)
     Segmentation = "Segmentation"

src/npe2/types.py

@@ -1,7 +1,7 @@
+from collections.abc import Mapping
 from typing import (
     TYPE_CHECKING,
     Callable,
-    Dict,
     List,
     Literal,
     NewType,
@@ -44,7 +44,7 @@ def __array__(self) -> "np.ndarray": ...  # pragma: no cover
 LayerName = Literal[
     "graph", "image", "labels", "points", "shapes", "surface", "tracks", "vectors"
 ]
-Metadata = Dict
+Metadata = Mapping
 DataType = Union[ArrayLike, Sequence[ArrayLike]]
 FullLayerData = Tuple[DataType, Metadata, LayerName]
 LayerData = Union[Tuple[DataType], Tuple[DataType, Metadata], FullLayerData]