npe2 0.7.8rc0__tar.gz → 0.7.9rc0__tar.gz

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

@@ -83,7 +83,7 @@ jobs:
           python -m pip install pytest pytest-pretty scikit-image[data] zarr xarray hypothesis matplotlib
 
       - name: Run napari plugin headless tests
-        run: pytest -W 'ignore::DeprecationWarning' napari/plugins napari/settings napari/layers napari/components
+        run: pytest -W 'ignore::DeprecationWarning' src/napari/plugins src/napari/settings src/napari/layers src/napari/components
         working-directory: napari-from-github
 
   test_docs_render:
@@ -104,6 +104,18 @@ jobs:
         run: python _docs/render.py
         env:
           NPE2_SCHEMA: "_schema.json"
+      - name: Build jupyter book
+        # install dependencies, 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
+        with:
+          path: "docs/_build/html"
 
   upload_coverage:
     needs: test

{npe2-0.7.8rc0 → npe2-0.7.9rc0}/.pre-commit-config.yaml

@@ -19,12 +19,12 @@ repos:
       - id: black
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.4
+    rev: v0.12.2
     hooks:
       - id: ruff
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.14.1
+    rev: v1.16.1
     hooks:
       - id: mypy
         additional_dependencies:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: npe2
-Version: 0.7.8rc0
+Version: 0.7.9rc0
 Summary: napari plugin engine v2
 Project-URL: homepage, https://github.com/napari/npe2
 Project-URL: repository, https://github.com/napari/npe2
@@ -19,8 +19,8 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
-Requires-Dist: appdirs
 Requires-Dist: build>=1
+Requires-Dist: platformdirs
 Requires-Dist: psygnal>=0.3.0
 Requires-Dist: pydantic
 Requires-Dist: pyyaml

{npe2-0.7.8rc0 → npe2-0.7.9rc0}/_docs/example_manifest.yaml

@@ -16,6 +16,15 @@ contributions:
     - id: example-plugin.do_threshold
       title: Perform threshold on image, return new image
       python_name: example_plugin.some_module:threshold
+    - id: example-plugin.threshold_otsu
+      title: Threshold using Otsu's method
+      python_name: example_plugin.some_module:threshold_otsu
+    - id: example-plugin.threshold_li
+      title: Threshold using Li's method
+      python_name: example_plugin.some_module:threshold_li
+    - id: example-plugin.all_thresholds
+      title: All thresholds
+      python_name: example_plugin.some_module:all_thresholds
     - id: example-plugin.threshold_widget
       title: Make threshold widget with magic_factory
       python_name: example_plugin.some_module:widget_factory
@@ -38,6 +47,16 @@ contributions:
     - command: example-plugin.do_threshold
       display_name: Threshold
       autogenerate: true
+  menus:
+    napari/layers/segment:
+      - submenu: threshold
+      - command: example-plugin.all_thresholds
+    threshold:
+      - command: example-plugin.threshold_otsu
+      - command: example-plugin.threshold_li
+  submenus:
+    - id: threshold
+      label: Thresholding
   themes:
     - label: "Monokai"
       id: "monokai"

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

@@ -182,13 +182,15 @@ def main(dest: Path = _BUILD):
     env.filters["has_guide"] = has_guide
 
     dest.mkdir(exist_ok=True, parents=True)
-    schema = PluginManifest.schema()
     if local_schema := os.getenv("NPE2_SCHEMA"):
         with open(local_schema) as f:
             schema = json.load(f)
     else:
-        with urlopen(SCHEMA_URL) as response:
-            schema = json.load(response)
+        try:
+            schema = PluginManifest.schema()
+        except Exception:
+            with urlopen(SCHEMA_URL) as response:
+                schema = json.load(response)
 
     contributions = schema["definitions"]["ContributionPoints"]["properties"]
     context = {

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

@@ -21,10 +21,21 @@ is being discussed.
 (contributions-{{ contrib_name|replace('_', '-') }})=
 ## `contributions.{{contrib_name}}`
 {# check if this is a single type, or a union #}
-{%- if contrib['items']['anyOf'] is defined %}
+{%- 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 union = True %}
+{%- else %}
+{%- set type_names = [contrib['additionalProperties']['items']['$ref']|replace("#/definitions/", "")] %}
+{%- set union = False %}
+{%- endif -%}
+{%- elif contrib['items']['anyOf'] is defined %}
+{# Handle array types with union #}
 {%- set type_names = contrib['items']['anyOf']|map(attribute='$ref')|map("replace", "#/definitions/", "")|list  %}
 {%- set union = True %}
 {%- else %}
+{# Handle array types with single type #}
 {%- set type_names = [contrib['items']['$ref']|replace("#/definitions/", "")] %}
 {%- set union = False %}
 {%- endif -%}
@@ -34,10 +45,17 @@ This contribution accepts {{ type_names|length }} schema types
 ```
 {%- endif -%}
 
+{%- if contrib.type == 'object' and contrib.additionalProperties is defined %}
+{# For object types like menus, use the contribution description directly #}
+{{ contrib.description }}
+{%- endif %}
+
 {%- for tname in type_names -%}
 {% set type = schema['definitions'][tname] %}
 {% if union %}##### {{loop.index}}. {{type.title}}{% endif %}
+{%- if contrib.type != 'object' or contrib.additionalProperties is not defined %}
 {{ type.description }}
+{%- endif %}
 
 {% if contrib_name|has_guide %}
 See the [{{ contrib_name.title()|replace('_', ' ') }} Guide]({{ contrib_name|replace('_', '-') }}-contribution-guide)

npe2-0.7.9rc0/_docs/templates/_npe2_menus_guide.md.jinja

@@ -0,0 +1,96 @@
+(menus-contribution-guide)=
+## Menus
+
+Menu contributions enable plugin developers to add new items or submenus to *existing* napari menus, allowing commands to be executed directly through the menu interface. This is a great mechanism for exposing simple commands or widgets that are generally applicable to a wide range of data.
+
+### `MenuItem` and `Submenu` Contributions
+
+Menu entries are defined using two primary mechanisms in the plugin manifest:
+
+- **MenuItem**: Adds a command to an existing menu location.
+- **Submenu**: Creates a new submenu (referenced by ID) that can itself contain menu items or other submenus.
+
+The structure of menu contributions requires first defining a command, then mapping it to a menu location.
+
+### Example: Thresholding submenu
+
+::::{tab-set}
+:::{tab-item} manifest
+
+```yaml
+name: napari-demo
+display_name: Demo plugin
+
+contributions:
+  commands:
+    - id: napari-demo.all_thresholds
+      title: Try All Thresholds
+      python_name: napari_demo:all_thresholds
+    - id: napari-demo.threshold_otsu
+      title: Otsu Threshold
+      python_name: napari_demo:threshold_otsu
+    - id: napari-demo.threshold_li
+      title: Li Threshold
+      python_name: napari_demo:threshold_li
+
+  menus:
+    napari/layers/segment:
+      - submenu: threshold
+      - command: napari-demo.all_thresholds
+    threshold:
+      - command: napari-demo.threshold_otsu
+      - command: napari-demo.threshold_li
+
+  submenus:
+    - id: threshold
+      label: Thresholding
+```
+:::
+
+:::{tab-item} python implementation
+
+```python
+# napari_demo module
+def all_thresholds(viewer: 'napari.viewer.Viewer'):
+    ...
+
+def threshold_otsu(image: 'napari.types.ImageData') -> 'napari.types.LabelsData':
+    ...
+
+def threshold_li(image: 'napari.types.ImageData') -> 'napari.types.LabelsData':
+    ...
+```
+:::
+::::
+
+### Guidelines
+
+- **Use menus for discoverability**: Menu contributions surface useful plugin functionality in an intuitive way.
+- **Separate UI concerns**: Commands exposed via menus should avoid opening dialogs unnecessarily unless the user has selected them.
+
+
+### Menu ID Reference
+
+Here's the full list of contributable menus. [source](https://github.com/napari/napari/blob/main/src/napari/_app_model/constants/_menus.py).
+
+```
+napari/file/new_layer
+napari/file/io_utilities
+napari/file/acquire
+
+napari/layers/visualize
+napari/layers/annotate
+
+napari/layers/data
+napari/layers/layer_type
+
+napari/layers/transform
+napari/layers/measure
+
+napari/layers/filter
+napari/layers/register
+napari/layers/project
+napari/layers/segment
+napari/layers/track
+napari/layers/classify
+```

{npe2-0.7.8rc0 → npe2-0.7.9rc0}/_docs/templates/_npe2_sample_data_guide.md.jinja

@@ -10,6 +10,10 @@ It can take the form of a **Sample Data URI** that points to a static resource
 (such as a file included in the plugin distribution, or a remote resource),
 or **Sample Data Function** that generates layer data on demand.
 
+Note that unlike reader contributions, sample data contributions are
+**always** expected to return data, so returning `[(None,)]`
+will cause an error.
+
 ### Sample Data example
 
 ::::{tab-set}

{npe2-0.7.8rc0 → npe2-0.7.9rc0}/codecov.yml

@@ -2,4 +2,4 @@ coverage:
   status:
     project:
       default:
-        target: 100%
+        target: 98%

{npe2-0.7.8rc0 → npe2-0.7.9rc0}/docs/_config.yml

@@ -45,7 +45,8 @@ sphinx:
     html_theme_options: {}
     pygments_style: solarized-dark
     suppress_warnings: ["myst.header"]
-    exclude_patterns: ['**/_*.md']  # includes
+    # build the generated files in this repo to preview them
+    # exclude_patterns: ['**/_*.md']  # includes
     templates_path:
         - '_templates'
     intersphinx_mapping:

{npe2-0.7.8rc0 → npe2-0.7.9rc0}/docs/index.md

@@ -2,5 +2,3 @@
 
 This is a stub file for building the plugin documentation.
 It is not used and should not be edited
-
-[go to plugins section](./plugins/index)

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

@@ -32,7 +32,7 @@ classifiers = [
 ]
 dependencies = [
     "PyYAML",
-    "appdirs",
+    "platformdirs",
     "build>=1",
     "psygnal>=0.3.0",
     "pydantic",

{npe2-0.7.8rc0 → npe2-0.7.9rc0}/src/npe2/_inspection/_fetch.py

@@ -160,9 +160,47 @@ def _get_manifest_from_zip_url(url: str) -> PluginManifest:
     --------
     $ npe2 fetch https://github.com/org/project/archive/refs/heads/master.zip
     """
+    from npe2.manifest import PluginManifest
+
+    def find_manifest_file(root: Path) -> Optional[Path]:
+        """Recursively find a napari manifest file."""
+        # Check current directory for manifest files
+        for filename in ["napari.yaml", "napari.yml"]:
+            manifest_path = root / filename
+            if manifest_path.exists():
+                return manifest_path
+
+        # Check for pyproject.toml with napari config
+        pyproject_path = root / "pyproject.toml"
+        if pyproject_path.exists():
+            try:
+                import tomllib
+            except ImportError:
+                import tomli as tomllib  # type: ignore
+
+            with open(pyproject_path, "rb") as f:
+                data = tomllib.load(f)
+                if "tool" in data and "napari" in data["tool"]:
+                    return pyproject_path
+
+        # Recursively search subdirectories for the manifest file
+        for item in root.iterdir():
+            if item.is_dir() and not item.name.startswith("."):
+                result = find_manifest_file(item)
+                if result:
+                    return result
+        return None
+
     with _tmp_zip_download(url) as zip_path:
-        src_dir = next(Path(zip_path).iterdir())  # find first directory
-        return _build_src_and_extract_manifest(src_dir)
+        # In a zip file, we do not need to build a wheel. We can extract
+        # the manifest directly from the extracted files.
+        manifest_file = find_manifest_file(Path(zip_path))
+        if manifest_file:
+            return PluginManifest.from_file(manifest_file)
+        else:
+            # Keep original behavior to try to build a wheel as a fallback
+            src_dir = next(Path(zip_path).iterdir())
+            return _build_src_and_extract_manifest(src_dir)
 
 
 def _get_manifest_from_wheel_url(url: str) -> PluginManifest:

{npe2-0.7.8rc0 → npe2-0.7.9rc0}/src/npe2/cli.py

@@ -11,7 +11,11 @@ from npe2 import PluginManager, PluginManifest, __version__
 if TYPE_CHECKING:
     from rich.console import RenderableType
 
-app = typer.Typer(no_args_is_help=True)
+app = typer.Typer(
+    no_args_is_help=True,
+    context_settings={"help_option_names": ["-h", "--help"]},
+    rich_markup_mode="rich",
+)
 
 
 def _show_version_and_exit(value: bool) -> None:
@@ -498,4 +502,10 @@ def compile(
 
 
 def main():
+    import sys
+
+    # If no arguments provided, show help without error box
+    if len(sys.argv) == 1:
+        sys.argv.append("--help")
+
     app()

{npe2-0.7.8rc0 → npe2-0.7.9rc0}/src/npe2/io_utils.py

@@ -319,5 +319,5 @@ def _write(
 
     # napari_get_writer-style writers don't always return a list
     # though strictly speaking they should?
-    result = [res] if isinstance(res, str) else res or []  # type: ignore
+    result = [res] if isinstance(res, str) else res or []
     return (result, writer) if return_writer else result

{npe2-0.7.8rc0 → npe2-0.7.9rc0}/src/npe2/manifest/_npe1_adapter.py

@@ -8,7 +8,7 @@ from pathlib import Path
 from shutil import rmtree
 from typing import List, Sequence
 
-from appdirs import user_cache_dir
+from platformdirs import user_cache_dir
 
 from npe2._inspection._from_npe1 import manifest_from_npe1
 from npe2.manifest import PackageMetadata

{npe2-0.7.8rc0 → npe2-0.7.9rc0}/src/npe2/manifest/contributions/_contributions.py

@@ -36,8 +36,15 @@ class ContributionPoints(BaseModel):
     widgets: Optional[List[WidgetContribution]]
     sample_data: Optional[List[SampleDataContribution]]
     themes: Optional[List[ThemeContribution]]
-    menus: Dict[str, List[MenuItem]] = Field(default_factory=dict, hide_docs=True)
-    submenus: Optional[List[SubmenuContribution]] = Field(None, hide_docs=True)
+    menus: Dict[str, List[MenuItem]] = Field(
+        default_factory=dict,
+        description="Add menu items to existing napari menus."
+        "A menu item can be a command, such as open a widget, or a submenu."
+        "Using menu items, nested hierarchies can be created within napari menus."
+        "This allows you to organize your plugin's contributions within"
+        "napari's menu structure.",
+    )
+    submenus: Optional[List[SubmenuContribution]]
     keybindings: Optional[List[KeyBindingContribution]] = Field(None, hide_docs=True)
 
     configuration: List[ConfigurationContribution] = Field(

{npe2-0.7.8rc0 → npe2-0.7.9rc0}/src/npe2/manifest/contributions/_sample_data.py

@@ -32,7 +32,9 @@ class SampleDataGenerator(_SampleDataContribution, Executable[List[LayerData]]):
     """Contribute a callable command that creates data on demand."""
 
     command: str = Field(
-        ..., description="Identifier of a command that returns layer data tuple."
+        ...,
+        description="Identifier of a command that returns layer data tuple. "
+        "Note that this command cannot return `[(None,)]`.",
     )
 
     def open(

{npe2-0.7.8rc0 → npe2-0.7.9rc0}/src/npe2/manifest/contributions/_submenu.py

@@ -6,6 +6,13 @@ from ._icon import Icon
 
 
 class SubmenuContribution(BaseModel):
+    """Contributes a submenu that can contain menu items or other submenus.
+
+    Submenus allow you to organize menu items into hierarchical structures.
+    Each submenu defines an id, label, and optional icon that can be
+    referenced by menu items to create nested menu structures.
+    """
+
     id: str = Field(description="Identifier of the menu to display as a submenu.")
     label: str = Field(
         description="The label of the menu item which leads to this submenu."

{npe2-0.7.8rc0 → npe2-0.7.9rc0}/tests/test_cli.py

@@ -212,3 +212,12 @@ def test_cli_version():
 def test_compile(compiled_plugin_dir):
     result = runner.invoke(app, ["compile", str(compiled_plugin_dir)])
     assert "id: my_compiled_plugin.my-plugin.generate_random_data" in result.output
+
+
+def test_main_no_args_shows_help(monkeypatch, capsys):
+    monkeypatch.setattr(sys, "argv", ["npe2"])
+    with pytest.raises(SystemExit) as e:
+        main()
+    assert e.value.code == 0
+    captured = capsys.readouterr()
+    assert "Usage:" in captured.out or "Usage:" in captured.err

npe2-0.7.9rc0/tests/test_fetch.py

@@ -0,0 +1,307 @@
+import os
+import urllib.request
+from importlib.metadata import PackageNotFoundError
+from unittest.mock import patch
+
+import pytest
+
+from npe2 import PluginManifest, fetch_manifest
+from npe2._inspection._fetch import (
+    _get_manifest_from_zip_url,
+    _manifest_from_pypi_sdist,
+    get_hub_plugin,
+    get_manifest_from_wheel,
+    get_pypi_url,
+)
+
+
+def test_fetch_npe2_manifest():
+    mf = fetch_manifest("napari-omero")
+    assert mf.name == "napari-omero"
+    assert any(mf.contributions.dict().values())
+    assert mf.npe1_shim is False
+
+
+@pytest.mark.skip("package looks deleted from pypi")
+def test_fetch_npe1_manifest_with_writer():
+    mf = fetch_manifest("dummy-test-plugin", version="0.1.3")
+    assert mf.name == "example-plugin"
+    assert mf.contributions.writers
+    # Test will eventually fail when example-plugin is updated to npe2
+    # This is here as a sentinel
+    assert mf.npe1_shim is True
+
+
+def test_fetch_npe1_manifest_with_sample_data():
+    mf = fetch_manifest("napari-kics")
+    assert mf.name == "napari-kics"
+    assert mf.contributions.sample_data
+    # Test will eventually fail when napari-kics is updated to npe2
+    # This is here as a sentinel
+    assert mf.npe1_shim is True
+
+
+def test_fetch_npe1_manifest_dock_widget_as_attribute():
+    # This tests is just to add coverage of a specific branch of code in the
+    # napari_experimental_provide_dock_widget parser, (where the return value
+    # is a dotted attribute, rather than a direct name).  I only saw it in
+    # brainreg-segment.
+    mf = fetch_manifest("brainreg-segment", version="0.2.18")
+    assert mf.name == "brainreg-segment"
+    assert mf.contributions.widgets
+    # This is here as a sentinel
+    assert mf.npe1_shim is True
+
+
+@pytest.mark.parametrize("version", [None, "0.1.0"])
+@pytest.mark.parametrize("packagetype", ["sdist", "bdist_wheel", None])
+def test_get_pypi_url(version, packagetype):
+    assert "npe2" in get_pypi_url("npe2", version=version, packagetype=packagetype)
+
+
+def test_from_pypi_wheel_bdist_missing():
+    error = PackageNotFoundError("No bdist_wheel releases found")
+    with patch("npe2._inspection._fetch.get_pypi_url", side_effect=error):
+        with pytest.raises(PackageNotFoundError):
+            fetch_manifest("my-package")
+
+
+@pytest.mark.skipif(not os.getenv("CI"), reason="slow, only run on CI")
+def test_manifest_from_sdist():
+    mf = _manifest_from_pypi_sdist("zarpaint")
+    assert mf.name == "zarpaint"
+
+
+def test_get_manifest_from_wheel(tmp_path):
+    url = "https://files.pythonhosted.org/packages/f0/cc/7f6fbce81be3eb73266f398e49df92859ba247134eb086704dd70b43819a/affinder-0.2.3-py3-none-any.whl"
+    dest = tmp_path / "affinder-0.2.3-py3-none-any.whl"
+    urllib.request.urlretrieve(url, dest)
+    mf = get_manifest_from_wheel(dest)
+    assert mf.name == "affinder"
+
+
+def test_get_hub_plugin():
+    info = get_hub_plugin("napari-svg")
+    assert info["name"] == "napari-svg"
+
+
+@pytest.mark.skipif(not os.getenv("CI"), reason="slow, only run on CI")
+@pytest.mark.parametrize(
+    "url",
+    [
+        "https://files.pythonhosted.org/packages/fb/01/e59bc1d6ac96f84ce9d7a46cc5422250e047958ead6c5693ed386cf94003/napari_dv-0.3.0.tar.gz",
+        "https://files.pythonhosted.org/packages/5d/ae/17779e12ce60d8329306963e1a8dec608465caee582440011ff0c1310715/example_plugin-0.0.7-py3-none-any.whl",
+        "git+https://github.com/napari/dummy-test-plugin.git@npe1",
+        # this one doesn't use setuptools_scm, can check direct zip without clone
+        "https://github.com/jo-mueller/napari-stl-exporter/archive/refs/heads/main.zip",
+    ],
+)
+def test_fetch_urls(url):
+    assert isinstance(fetch_manifest(url), PluginManifest)
+
+
+def test_get_manifest_from_zip_url(tmp_path, monkeypatch):
+    # Mock the _tmp_zip_download context manager
+    mock_zip_path = tmp_path / "extracted"
+    mock_zip_path.mkdir()
+
+    # Create a mock source directory inside the extracted zip
+    src_dir = mock_zip_path / "plugin-source-1.0"
+    src_dir.mkdir()
+
+    # Mock the _build_src_and_extract_manifest to return a test manifest
+    test_manifest = PluginManifest(name="test-plugin")
+
+    def mock_build_src_and_extract_manifest(src_dir):
+        return test_manifest
+
+    from contextlib import contextmanager
+
+    @contextmanager
+    def mock_tmp_zip_download(url):
+        yield mock_zip_path
+
+    monkeypatch.setattr(
+        "npe2._inspection._fetch._tmp_zip_download", mock_tmp_zip_download
+    )
+    monkeypatch.setattr(
+        "npe2._inspection._fetch._build_src_and_extract_manifest",
+        mock_build_src_and_extract_manifest,
+    )
+
+    # Test the function
+    result = _get_manifest_from_zip_url("https://example.com/plugin.zip")
+
+    # Verify the result
+    assert result == test_manifest
+    assert result.name == "test-plugin"
+
+
+def test_get_manifest_from_zip_url_with_pyproject_toml_tomllib(tmp_path, monkeypatch):
+    # Test pyproject.toml with napari config using tomllib
+    mock_zip_path = tmp_path / "extracted"
+    mock_zip_path.mkdir()
+
+    # Create pyproject.toml with napari config
+    pyproject_content = b"""
+[tool.napari]
+name = "test-plugin"
+"""
+    pyproject_path = mock_zip_path / "pyproject.toml"
+    pyproject_path.write_bytes(pyproject_content)
+
+    from contextlib import contextmanager
+
+    @contextmanager
+    def mock_tmp_zip_download(url):
+        yield mock_zip_path
+
+    monkeypatch.setattr(
+        "npe2._inspection._fetch._tmp_zip_download", mock_tmp_zip_download
+    )
+
+    # Mock PluginManifest.from_file to return a test manifest
+    test_manifest = PluginManifest(name="test-plugin")
+    monkeypatch.setattr(
+        "npe2.manifest.PluginManifest.from_file", lambda path: test_manifest
+    )
+
+    # Test the function
+    result = _get_manifest_from_zip_url("https://example.com/plugin.zip")
+
+    # Verify the result
+    assert result == test_manifest
+    assert result.name == "test-plugin"
+
+
+def test_get_manifest_from_zip_url_with_pyproject_toml_tomli(tmp_path, monkeypatch):
+    # Test pyproject.toml with napari config using tomli fallback
+    mock_zip_path = tmp_path / "extracted"
+    mock_zip_path.mkdir()
+
+    # Create pyproject.toml with napari config
+    pyproject_content = b"""
+[tool.napari]
+name = "test-plugin"
+"""
+    pyproject_path = mock_zip_path / "pyproject.toml"
+    pyproject_path.write_bytes(pyproject_content)
+
+    from contextlib import contextmanager
+
+    @contextmanager
+    def mock_tmp_zip_download(url):
+        yield mock_zip_path
+
+    monkeypatch.setattr(
+        "npe2._inspection._fetch._tmp_zip_download", mock_tmp_zip_download
+    )
+
+    # Mock PluginManifest.from_file to return a test manifest
+    test_manifest = PluginManifest(name="test-plugin")
+    monkeypatch.setattr(
+        "npe2.manifest.PluginManifest.from_file", lambda path: test_manifest
+    )
+
+    # Mock tomllib to not exist, forcing tomli fallback
+    import sys
+
+    original_modules = sys.modules.copy()
+    if "tomllib" in sys.modules:
+        del sys.modules["tomllib"]
+
+    try:
+        # Test the function
+        result = _get_manifest_from_zip_url("https://example.com/plugin.zip")
+
+        # Verify the result
+        assert result == test_manifest
+        assert result.name == "test-plugin"
+    finally:
+        # Restore modules
+        sys.modules.update(original_modules)
+
+
+def test_get_manifest_from_zip_url_with_pyproject_toml_no_napari(tmp_path, monkeypatch):
+    # Test pyproject.toml without napari config
+    mock_zip_path = tmp_path / "extracted"
+    mock_zip_path.mkdir()
+
+    # Create pyproject.toml without napari config
+    pyproject_content = b"""
+[tool.other]
+name = "other-tool"
+"""
+    pyproject_path = mock_zip_path / "pyproject.toml"
+    pyproject_path.write_bytes(pyproject_content)
+
+    # Create a mock source directory for fallback
+    src_dir = mock_zip_path / "plugin-source"
+    src_dir.mkdir()
+
+    from contextlib import contextmanager
+
+    @contextmanager
+    def mock_tmp_zip_download(url):
+        yield mock_zip_path
+
+    monkeypatch.setattr(
+        "npe2._inspection._fetch._tmp_zip_download", mock_tmp_zip_download
+    )
+
+    # Mock the fallback to build from source
+    test_manifest = PluginManifest(name="test-plugin")
+    monkeypatch.setattr(
+        "npe2._inspection._fetch._build_src_and_extract_manifest",
+        lambda src_dir: test_manifest,
+    )
+
+    # Test the function
+    result = _get_manifest_from_zip_url("https://example.com/plugin.zip")
+
+    # Verify the result (should use fallback since no napari config)
+    assert result == test_manifest
+    assert result.name == "test-plugin"
+
+
+def test_pyproject_toml_napari_section_coverage(tmp_path, monkeypatch):
+    # Direct test of the find_manifest_file function to ensure coverage
+    from npe2._inspection._fetch import _get_manifest_from_zip_url
+
+    mock_zip_path = tmp_path / "extracted"
+    mock_zip_path.mkdir()
+
+    # Create nested directory structure
+    nested_dir = mock_zip_path / "plugin" / "src"
+    nested_dir.mkdir(parents=True)
+
+    # Create pyproject.toml with napari config in nested dir
+    pyproject_content = b"""
+[tool.napari]
+name = "test-plugin"
+display_name = "Test Plugin"
+"""
+    pyproject_path = nested_dir / "pyproject.toml"
+    pyproject_path.write_bytes(pyproject_content)
+
+    # Create a napari.yaml manifest
+    manifest_content = """
+name: test-plugin
+display_name: Test Plugin
+"""
+    manifest_path = nested_dir / "napari.yaml"
+    manifest_path.write_text(manifest_content)
+
+    from contextlib import contextmanager
+
+    @contextmanager
+    def mock_tmp_zip_download(url):
+        yield mock_zip_path
+
+    monkeypatch.setattr(
+        "npe2._inspection._fetch._tmp_zip_download", mock_tmp_zip_download
+    )
+
+    # Test the function - it should find the napari.yaml first
+    result = _get_manifest_from_zip_url("https://example.com/plugin.zip")
+    assert result.name == "test-plugin"

{npe2-0.7.8rc0 → npe2-0.7.9rc0}/tests/test_manifest.py

@@ -44,6 +44,7 @@ def test_discover(uses_sample_plugin):
     assert error is None
 
 
+@pytest.mark.filterwarnings("ignore:Implicit None on return values is deprecated")
 def test_discover_errors(tmp_path: Path):
     """testing various discovery errors"""
     # package with proper `napari.manifest` entry_point, but invalid pointer to

npe2-0.7.8rc0/docs/_toc.yml

@@ -1,14 +0,0 @@
-format: jb-article
-root: index
-sections:
-# this is meant to match the plugins toc at napari
-- file: plugins/index
-  sections:
-  - file: plugins/first_plugin
-  - file: plugins/manifest
-  - file: plugins/contributions
-  - file: plugins/guides
-  - file: plugins/test_deploy
-  - file: plugins/best_practices
-  - file: plugins/npe2_migration_guide
-  - file: plugins/npe1

npe2-0.7.8rc0/tests/test_fetch.py

@@ -1,99 +0,0 @@
-import os
-import urllib.request
-from importlib.metadata import PackageNotFoundError
-from unittest.mock import patch
-
-import pytest
-
-from npe2 import PluginManifest, fetch_manifest
-from npe2._inspection._fetch import (
-    _manifest_from_pypi_sdist,
-    get_hub_plugin,
-    get_manifest_from_wheel,
-    get_pypi_url,
-)
-
-
-def test_fetch_npe2_manifest():
-    mf = fetch_manifest("napari-omero")
-    assert mf.name == "napari-omero"
-    assert any(mf.contributions.dict().values())
-    assert mf.npe1_shim is False
-
-
-@pytest.mark.skip("package looks deleted from pypi")
-def test_fetch_npe1_manifest_with_writer():
-    mf = fetch_manifest("dummy-test-plugin", version="0.1.3")
-    assert mf.name == "example-plugin"
-    assert mf.contributions.writers
-    # Test will eventually fail when example-plugin is updated to npe2
-    # This is here as a sentinel
-    assert mf.npe1_shim is True
-
-
-def test_fetch_npe1_manifest_with_sample_data():
-    mf = fetch_manifest("napari-kics")
-    assert mf.name == "napari-kics"
-    assert mf.contributions.sample_data
-    # Test will eventually fail when napari-kics is updated to npe2
-    # This is here as a sentinel
-    assert mf.npe1_shim is True
-
-
-def test_fetch_npe1_manifest_dock_widget_as_attribute():
-    # This tests is just to add coverage of a specific branch of code in the
-    # napari_experimental_provide_dock_widget parser, (where the return value
-    # is a dotted attribute, rather than a direct name).  I only saw it in
-    # brainreg-segment.
-    mf = fetch_manifest("brainreg-segment", version="0.2.18")
-    assert mf.name == "brainreg-segment"
-    assert mf.contributions.widgets
-    # This is here as a sentinel
-    assert mf.npe1_shim is True
-
-
-@pytest.mark.parametrize("version", [None, "0.1.0"])
-@pytest.mark.parametrize("packagetype", ["sdist", "bdist_wheel", None])
-def test_get_pypi_url(version, packagetype):
-    assert "npe2" in get_pypi_url("npe2", version=version, packagetype=packagetype)
-
-
-def test_from_pypi_wheel_bdist_missing():
-    error = PackageNotFoundError("No bdist_wheel releases found")
-    with patch("npe2._inspection._fetch.get_pypi_url", side_effect=error):
-        with pytest.raises(PackageNotFoundError):
-            fetch_manifest("my-package")
-
-
-@pytest.mark.skipif(not os.getenv("CI"), reason="slow, only run on CI")
-def test_manifest_from_sdist():
-    mf = _manifest_from_pypi_sdist("zarpaint")
-    assert mf.name == "zarpaint"
-
-
-def test_get_manifest_from_wheel(tmp_path):
-    url = "https://files.pythonhosted.org/packages/f0/cc/7f6fbce81be3eb73266f398e49df92859ba247134eb086704dd70b43819a/affinder-0.2.3-py3-none-any.whl"
-    dest = tmp_path / "affinder-0.2.3-py3-none-any.whl"
-    urllib.request.urlretrieve(url, dest)
-    mf = get_manifest_from_wheel(dest)
-    assert mf.name == "affinder"
-
-
-def test_get_hub_plugin():
-    info = get_hub_plugin("napari-svg")
-    assert info["name"] == "napari-svg"
-
-
-@pytest.mark.skipif(not os.getenv("CI"), reason="slow, only run on CI")
-@pytest.mark.parametrize(
-    "url",
-    [
-        "https://files.pythonhosted.org/packages/fb/01/e59bc1d6ac96f84ce9d7a46cc5422250e047958ead6c5693ed386cf94003/napari_dv-0.3.0.tar.gz",
-        "https://files.pythonhosted.org/packages/5d/ae/17779e12ce60d8329306963e1a8dec608465caee582440011ff0c1310715/example_plugin-0.0.7-py3-none-any.whl",
-        "git+https://github.com/napari/dummy-test-plugin.git@npe1",
-        # this one doesn't use setuptools_scm, can check direct zip without clone
-        "https://github.com/jo-mueller/napari-stl-exporter/archive/refs/heads/main.zip",
-    ],
-)
-def test_fetch_urls(url):
-    assert isinstance(fetch_manifest(url), PluginManifest)