npe2 0.7.9rc0__tar.gz → 0.8.0rc0__tar.gz

{npe2-0.7.9rc0 → npe2-0.8.0rc0}/.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
     name: Check Manifest
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Check
         run: pipx run check-manifest
 
@@ -28,22 +28,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
         platform: [ubuntu-latest, macos-latest, windows-latest]
-        pydantic: ["pydantic<2", "pydantic>2"]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install "${{ matrix.pydantic }}"
           pip install -e .[json,docs,testing]
 
       - name: Test Main docs build
@@ -53,9 +51,9 @@ jobs:
           coverage run --source=npe2 -m pytest --color yes
 
       - name: Upload coverage as artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
-          name: coverage reports ${{ matrix.platform }} py ${{ matrix.python-version }} ${{ (matrix.pydantic == 'pydantic<2' && 'pydantic_lt_2') || 'pydantic_gt_2' }}
+          name: coverage reports ${{ matrix.platform }} py ${{ matrix.python-version }}
           path: |
             ./.coverage.*
           include-hidden-files: true
@@ -64,14 +62,14 @@ jobs:
     name: napari tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           repository: napari/napari
           path: napari-from-github
           fetch-depth: 0
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
           python-version: "3.10"
       - name: Install
@@ -90,10 +88,10 @@ jobs:
     name: docs render
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version: "3.x"
+          python-version: "3.14"
       - name: Build schema
         run: |
           python -m pip install --upgrade pip
@@ -105,15 +103,14 @@ jobs:
         env:
           NPE2_SCHEMA: "_schema.json"
       - name: Build jupyter book
-        # install dependencies, generate toc, then build
+        # generate toc, then build
         run: |
-          pip install jupyter-book sphinx-tabs furo
           cd docs
           jupyter-book toc from-project . -f jb-book > _toc.yml
           jupyter-book build .
       # Upload the book's HTML as an artifact
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4.0.0
         with:
           path: "docs/_build/html"
 
@@ -123,11 +120,11 @@ jobs:
     if: always()
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version: "3.x"
+          python-version: "3.14"
           cache-dependency-path: setup.cfg
           cache: 'pip'
 
@@ -137,7 +134,7 @@ jobs:
           pip install codecov
 
       - name: Download coverage data
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           pattern: coverage reports*
           path: coverage
@@ -152,7 +149,7 @@ jobs:
           python -Im coverage report --format=markdown --skip-empty --skip-covered >> $GITHUB_STEP_SUMMARY
 
       - name: Upload coverage data
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
         with:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -166,10 +163,10 @@ jobs:
       contents: write
       id-token: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
           python-version: "3.x"
 
@@ -194,7 +191,7 @@ jobs:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.TWINE_API_KEY }}
 
-      - uses: softprops/action-gh-release@v2
+      - uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
         if: startsWith(github.ref, 'refs/tags/')
         with:
           generate_release_notes: true

{npe2-0.7.9rc0 → npe2-0.8.0rc0}/.github/workflows/test_all_plugins.yml

@@ -39,11 +39,11 @@ jobs:
         shell: bash -l {0}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - uses: tlambert03/setup-qt-libs@v1
+      - uses: tlambert03/setup-qt-libs@19e4ef2d781d81f5f067182e228b54ec90d23b76 # v1.8
 
-      - uses: conda-incubator/setup-miniconda@v3
+      - uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3.3.0
         with:
           python-version: '3.10'
           miniforge-variant: Miniforge3

{npe2-0.7.9rc0 → npe2-0.8.0rc0}/.github/workflows/test_conversion.yml

@@ -29,8 +29,8 @@ jobs:
         plugin: ${{ fromJson(needs.get-plugins.outputs.plugins) }}
 
     steps:
-      - uses: tlambert03/setup-qt-libs@v1
-      - uses: actions/setup-python@v5
+      - uses: tlambert03/setup-qt-libs@19e4ef2d781d81f5f067182e228b54ec90d23b76 # v1.8
+      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
           python-version: 3.9
 
@@ -50,7 +50,7 @@ jobs:
           echo "plugin_repo=$URL" >> $GITHUB_ENV
 
       - name: Checkout plugin repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           repository: ${{ env.plugin_repo }}
           path: 'plugin_repo'
@@ -61,7 +61,7 @@ jobs:
 
       - name: Test Conversion
         id: test-without-napari
-        uses: aganders3/headless-gui@v2
+        uses: aganders3/headless-gui@f85dd6316993505dfc5f21839d520ae440c84816 # v2.2
         continue-on-error: true
         with:
           run: npe2 convert ./plugin_repo
@@ -73,13 +73,13 @@ jobs:
       - name: Test Conversion again with napari
         id: test-with-napari
         if: ${{ steps.test-without-napari.outcome == 'failure' }}
-        uses: aganders3/headless-gui@v2
+        uses: aganders3/headless-gui@f85dd6316993505dfc5f21839d520ae440c84816 # v2.2
         with:
           run: npe2 convert ./plugin_repo
 
       - name: Test Conversion again with napari
         if: ${{ steps.test-without-napari.outcome == 'failure' && steps.test-with-napari.outcome == 'failure' }}
-        uses: aganders3/headless-gui@v2
+        uses: aganders3/headless-gui@f85dd6316993505dfc5f21839d520ae440c84816 # v2.2
         with:
           # try without modifying directory
           run: npe2 convert -n ${{ matrix.plugin }}

{npe2-0.7.9rc0 → npe2-0.8.0rc0}/.github/workflows/update_changelog.yml

@@ -11,15 +11,15 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: "✏️ Generate release changelog"
-        uses: heinrichreimer/github-changelog-generator-action@v2.4
+        uses: heinrichreimer/github-changelog-generator-action@e60b5a2bd9fcd88dadf6345ff8327863fb8b490f # v2.4
         with:
           futureRelease: ${{ github.event.inputs.next_tag }}
           token: ${{ secrets.GITHUB_TOKEN }}
           repo: napari/npe2
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Automatic changelog update

{npe2-0.7.9rc0 → npe2-0.8.0rc0}/.gitignore

@@ -110,3 +110,5 @@ src/npe2/_version.py
 # ignore everything that gets rendered from _docs
 docs/plugins/*.md
 schema.json
+
+uv.lock

npe2-0.8.0rc0/.pre-commit-config.yaml

@@ -0,0 +1,32 @@
+ci:
+  autoupdate_schedule: monthly
+  autofix_commit_msg: "style: [pre-commit.ci] auto fixes [...]"
+  autoupdate_commit_msg: "ci: [pre-commit.ci] autoupdate"
+
+exclude: _docs/example_plugin/some_module.py
+
+repos:
+
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.14.14
+  hooks:
+  - id: ruff-check
+  - id: ruff-format
+
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v6.0.0
+  hooks:
+    - id: check-docstring-first
+    - id: end-of-file-fixer
+    - id: trailing-whitespace
+    - id: check-yaml
+    - id: check-toml
+
+- repo: https://github.com/pre-commit/mirrors-mypy
+  rev: v1.19.1
+  hooks:
+    - id: mypy
+      additional_dependencies:
+        - types-toml
+        - types-PyYAML
+      exclude: npe2/implements.pyi|_docs/render.py

{npe2-0.7.9rc0 → npe2-0.8.0rc0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: npe2
-Version: 0.7.9rc0
+Version: 0.8.0rc0
 Summary: napari plugin engine v2
 Project-URL: homepage, https://github.com/napari/npe2
 Project-URL: repository, https://github.com/napari/npe2
@@ -13,38 +13,45 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Typing :: Typed
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Requires-Dist: build>=1
 Requires-Dist: platformdirs
 Requires-Dist: psygnal>=0.3.0
-Requires-Dist: pydantic
+Requires-Dist: pydantic-extra-types
+Requires-Dist: pydantic>1
 Requires-Dist: pyyaml
 Requires-Dist: rich
 Requires-Dist: tomli-w
 Requires-Dist: tomli; python_version < '3.11'
 Requires-Dist: typer
 Provides-Extra: dev
-Requires-Dist: black; extra == 'dev'
 Requires-Dist: ipython; extra == 'dev'
 Requires-Dist: isort; extra == 'dev'
 Requires-Dist: mypy; extra == 'dev'
 Requires-Dist: pre-commit; extra == 'dev'
+Requires-Dist: ruff; extra == 'dev'
 Provides-Extra: docs
+Requires-Dist: furo; extra == 'docs'
 Requires-Dist: jinja2; extra == 'docs'
+Requires-Dist: jupyter-book<2; extra == 'docs'
 Requires-Dist: magicgui>=0.3.3; extra == 'docs'
+Requires-Dist: sphinx-tabs; extra == 'docs'
 Provides-Extra: json
 Requires-Dist: jsonschema; extra == 'json'
 Provides-Extra: testing
+Requires-Dist: build; extra == 'testing'
 Requires-Dist: jsonschema; extra == 'testing'
 Requires-Dist: magicgui; extra == 'testing'
 Requires-Dist: napari-plugin-engine; extra == 'testing'
 Requires-Dist: napari-svg==0.1.5; extra == 'testing'
 Requires-Dist: numpy; extra == 'testing'
+Requires-Dist: pip; extra == 'testing'
 Requires-Dist: pytest; extra == 'testing'
 Requires-Dist: pytest-cov; extra == 'testing'
 Requires-Dist: pytest-pretty; extra == 'testing'
@@ -72,7 +79,6 @@ offers comprehensive information for **plugin users** and for **plugin developer
 ### Plugin users
 
 For plugin users, the docs include information about:
-- [Starting to use plugins](https://napari.org/stable/plugins/start_using_plugins/index.html#plugins-getting-started)
 - [Finding and installing plugins](https://napari.org/stable/plugins/start_using_plugins/finding_and_installing_plugins.html#find-and-install-plugins)
 
 ### Plugin developers

{npe2-0.7.9rc0 → npe2-0.8.0rc0}/README.md

@@ -20,7 +20,6 @@ offers comprehensive information for **plugin users** and for **plugin developer
 ### Plugin users
 
 For plugin users, the docs include information about:
-- [Starting to use plugins](https://napari.org/stable/plugins/start_using_plugins/index.html#plugins-getting-started)
 - [Finding and installing plugins](https://napari.org/stable/plugins/start_using_plugins/finding_and_installing_plugins.html#find-and-install-plugins)
 
 ### Plugin developers

{npe2-0.7.9rc0 → npe2-0.8.0rc0}/_docs/example_plugin/some_module.py

@@ -1,6 +1,6 @@
 # python_name: example_plugin._data:fractal
 
-from typing import TYPE_CHECKING, Any, Dict, List, Optional
+from typing import TYPE_CHECKING, Any, Optional
 
 from magicgui import magic_factory
 from qtpy.QtWidgets import QWidget
@@ -8,10 +8,11 @@ from qtpy.QtWidgets import QWidget
 if TYPE_CHECKING:
     import napari.types
     import napari.viewer
+
     from npe2.types import LayerData, PathOrPaths, ReaderFunction
 
 
-def write_points(path: str, layer_data: Any, attributes: Dict[str, Any]) -> List[str]:
+def write_points(path: str, layer_data: Any, attributes: dict[str, Any]) -> list[str]:
     with open(path, "w"):
         ...  # save layer_data and attributes to file
 
@@ -27,7 +28,7 @@ def get_reader(path: "PathOrPaths") -> Optional["ReaderFunction"]:
     return None
 
 
-def xyz_file_reader(path: "PathOrPaths") -> List["LayerData"]:
+def xyz_file_reader(path: "PathOrPaths") -> list["LayerData"]:
     data = ...  # somehow read data from path
     layer_attributes = {"name": "etc..."}
     return [(data, layer_attributes)]
@@ -63,7 +64,7 @@ def threshold(
     return (image > threshold).astype(int)
 
 
-def create_fractal() -> List["LayerData"]:
+def create_fractal() -> list["LayerData"]:
     """An example of a  Sample Data Function.
 
     Note: Sample Data with URIs don't need python code.

{npe2-0.7.9rc0 → npe2-0.8.0rc0}/_docs/render.py

@@ -10,7 +10,6 @@ from functools import lru_cache, partial
 from inspect import getsource
 from pathlib import Path
 from types import FunctionType
-from typing import Dict, Optional, Set
 from urllib.request import urlopen
 
 import yaml
@@ -46,7 +45,7 @@ def _mocked_qtwidgets():
 
 
 @lru_cache
-def type_strings() -> Dict[str, str]:
+def type_strings() -> dict[str, str]:
     """Return map of type name to source code for all types in types.py"""
     from npe2 import types as _t
 
@@ -76,7 +75,7 @@ def type_strings() -> Dict[str, str]:
     return type_strings
 
 
-def _get_needed_types(source: str, so_far: Optional[Set[str]] = None) -> Set[str]:
+def _get_needed_types(source: str, so_far: set[str] | None = None) -> set[str]:
     """Return the names of types in the npe2.types.py that are used in `source`"""
     so_far = so_far or set()
     for name, string in type_strings().items():
@@ -150,7 +149,7 @@ def example_contribution(
             if not ex.commands:
                 ex.commands = []
             ex.commands.append(associated_command)
-    output = {"contributions": json.loads(ex.json(exclude_unset=True))}
+    output = {"contributions": json.loads(ex.model_dump_json(exclude_unset=True))}
     if format == "yaml":
         return yaml.safe_dump(output, sort_keys=False)
     if format == "toml":
@@ -192,7 +191,7 @@ def main(dest: Path = _BUILD):
             with urlopen(SCHEMA_URL) as response:
                 schema = json.load(response)
 
-    contributions = schema["definitions"]["ContributionPoints"]["properties"]
+    contributions = schema["$defs"]["ContributionPoints"]["properties"]
     context = {
         "schema": schema,
         "contributions": contributions,

{npe2-0.7.9rc0 → npe2-0.8.0rc0}/_docs/templates/_npe2_contributions.md.jinja

@@ -24,19 +24,19 @@ is being discussed.
 {%- if contrib.type == 'object' and contrib.additionalProperties is defined %}
 {# Handle object types like menus #}
 {%- if contrib['additionalProperties']['items']['anyOf'] is defined %}
-{%- set type_names = contrib['additionalProperties']['items']['anyOf']|map(attribute='$ref')|map("replace", "#/definitions/", "")|list  %}
+{%- set type_names = contrib['additionalProperties']['items']['anyOf']|map(attribute='$ref')|map("replace", "#/$defs/", "")|list  %}
 {%- set union = True %}
 {%- else %}
 {%- set type_names = [contrib['additionalProperties']['items']['$ref']|replace("#/definitions/", "")] %}
 {%- set union = False %}
 {%- endif -%}
-{%- elif contrib['items']['anyOf'] is defined %}
+{%- elif contrib['anyOf'] is defined %}
 {# Handle array types with union #}
-{%- set type_names = contrib['items']['anyOf']|map(attribute='$ref')|map("replace", "#/definitions/", "")|list  %}
+{%- set type_names = contrib['anyOf']|map(attribute='items')|selectattr('$ref')|map(attribute='$ref')|map("replace", "#/$defs/", "")|list  %}
 {%- set union = True %}
 {%- else %}
 {# Handle array types with single type #}
-{%- set type_names = [contrib['items']['$ref']|replace("#/definitions/", "")] %}
+{%- set type_names = [contrib['items']['$ref']|replace("#/$defs/", "")] %}
 {%- set union = False %}
 {%- endif -%}
 {%- if union %}
@@ -51,7 +51,7 @@ This contribution accepts {{ type_names|length }} schema types
 {%- endif %}
 
 {%- for tname in type_names -%}
-{% set type = schema['definitions'][tname] %}
+{% set type = schema['$defs'][tname] %}
 {% if union %}##### {{loop.index}}. {{type.title}}{% endif %}
 {%- if contrib.type != 'object' or contrib.additionalProperties is not defined %}
 {{ type.description }}

{npe2-0.7.9rc0 → npe2-0.8.0rc0}/_docs/templates/_npe2_readers_guide.md.jinja

@@ -6,14 +6,52 @@ They are invoked whenever `viewer.open('some/path')` is used on the
 command line, or when a user opens a file in the graphical user interface by
 dropping a file into the canvas, or using `File -> Open...`
 
-The `command` provided by a reader contribution is expected to be a function
+### Introduction to the `reader` contribution
+
+`napari`'s reading process is motivated by the idea that a plugin should
+**only** attempt to read a file once we are fairly confident that this process
+will not fail. The determination of whether a plugin **can** read a file is
+based on two checks:
+
+- The `filename_patterns` field of the manifest contribution. If the given
+path does not match any of the specified `filename_patterns`, the plugin
+will never be given the file
+- The `command` provided by the reader contribution. The plugin developer
+should use this function, sometimes called `napari_get_reader` or `get_reader`,
+to check various properties and attributes of
+the file at the given path to determine whether it can be read
+
+The `get_reader` `command` provided by a reader contribution is expected to be a function
 that accepts a path (`str`) or a list of paths and:
 * returns `None` (if it does not want to accept the given path)
-* returns a *new function* (a `ReaderFunction`) that is capable of doing the reading.
+* returns a *new function* that is capable of doing the reading.
+
+```{admonition} Why do we need two functions?
+The `get_reader` command should make as many checks as possible
+(without loading the full file) to determine if it can read the path. For example,
+you might check for the presence of specific pointer files (like a `zarr.json`), or
+call a file format validating function to ensure the file is well-formed
+before reading, or inspect a few bytes at the beginning of the file to
+make sure it's the right file format.
+
+Another benefit of the `get_reader` function is that it allows the plugin
+developer to define multiple different reading functions depending on
+the file format or its properties, and return the appropriate one for the given path.
+
+This function should not raise exceptions, as napari has its own handlers
+that check for available compatible readers, and surface this information
+to the user. The `ReaderFunction` (described below), **can** raise errors,
+and napari will surface any raised errors to the user.
+```
 
 The `ReaderFunction` will be passed the same path (or list of paths) and
 is expected to return a list containing {ref}`LayerData tuples <layer-data-tuples>` or
-a fully instantiated napari `Layer` objects like `Image` or `Labels`.
+a fully instantiated napari `Layer` objects like `Image` or `Labels`. Formally, the
+`ReaderFunction` type is specified as:
+
+```python
+ReaderFunction = Callable[[PathOrPaths], List[LayerData]]
+```
 
 In the rare case that a reader plugin would like to "claim" a file, but *not*
 actually add any data to the viewer, the `ReaderFunction` may return

{npe2-0.7.9rc0 → npe2-0.8.0rc0}/pyproject.toml

@@ -12,7 +12,7 @@ name = "npe2"
 dynamic = ["version"]
 description = "napari plugin engine v2"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 license = { text = "BSD-3-Clause" }
 authors = [
     { name = "Talley Lambert", email = "talley.lambert@gmail.com" },
@@ -24,10 +24,11 @@ classifiers = [
     "Natural Language :: English",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Typing :: Typed",
 ]
 dependencies = [
@@ -35,7 +36,8 @@ dependencies = [
     "platformdirs",
     "build>=1",
     "psygnal>=0.3.0",
-    "pydantic",
+    "pydantic>1",
+    "pydantic_extra_types",
     "tomli-w",
     "tomli; python_version < '3.11'",
     "rich",
@@ -57,9 +59,11 @@ testing = [
     "pytest-cov",
     "jsonschema",
     "pytest-pretty",
+    "build",
+    "pip",
 ]
-dev = ["black", "ipython", "isort", "mypy", "pre-commit"]
-docs = ["Jinja2", "magicgui>=0.3.3"]
+dev = ["ruff", "ipython", "isort", "mypy", "pre-commit"]
+docs = ["Jinja2", "magicgui>=0.3.3", "furo", "jupyter-book<2", "sphinx-tabs"]
 json = ["jsonschema"]
 
 # Entry points
@@ -88,14 +92,10 @@ markers = [
     "github_main_only: Test to run only on github main (verify it does not break latest napari docs build)",
 ]
 
-[tool.black]
-target-version = ['py38', 'py39', 'py310']
-line-length = 88
-
 # https://github.com/charliermarsh/ruff
 [tool.ruff]
 line-length = 88
-target-version = "py38"
+target-version = "py310"
 fix = true
 src = ["src/npe2", "tests"]
 lint.select = [

{npe2-0.7.9rc0 → npe2-0.8.0rc0}/src/npe2/_command_registry.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from dataclasses import dataclass
 from functools import partial
-from typing import TYPE_CHECKING, Any, Callable, Dict, Optional, Union
+from typing import TYPE_CHECKING, Any
 
 from psygnal import Signal
 
@@ -19,8 +20,8 @@ if TYPE_CHECKING:
 @dataclass
 class CommandHandler:
     id: str
-    function: Optional[Callable] = None
-    python_name: Optional[PythonName] = None
+    function: Callable | None = None
+    python_name: PythonName | None = None
 
     def resolve(self) -> Callable:
         if self.function is not None:
@@ -50,9 +51,9 @@ class CommandRegistry:
     command_unregistered = Signal(str)
 
     def __init__(self) -> None:
-        self._commands: Dict[str, CommandHandler] = {}
+        self._commands: dict[str, CommandHandler] = {}
 
-    def register(self, id: str, command: Union[Callable, str]) -> PDisposable:
+    def register(self, id: str, command: Callable | str) -> PDisposable:
         """Register a command under `id`.
 
         Parameters