napari-plugin-manager 0.1.5rc0__tar.gz → 0.1.6__tar.gz

{napari_plugin_manager-0.1.5rc0 → napari_plugin_manager-0.1.6}/.github/workflows/test_and_deploy.yml

@@ -173,7 +173,7 @@ jobs:
         uses: codecov/codecov-action@v5
         with:
           fail_ci_if_error: true
-          use_oidc: true
+          use_oidc: ${{ github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) }}
 
 
   deploy:

{napari_plugin_manager-0.1.5rc0 → napari_plugin_manager-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: napari-plugin-manager
-Version: 0.1.5rc0
+Version: 0.1.6
 Summary: Install plugins for napari, in napari.
 Author-email: napari team <napari-steering-council@googlegroups.com>
 License: BSD 3-Clause License

{napari_plugin_manager-0.1.5rc0 → napari_plugin_manager-0.1.6}/src/napari_plugin_manager/_tests/test_npe2api.py

@@ -27,6 +27,7 @@ def test_plugin_summaries():
         "home_page",
         "pypi_versions",
         "conda_versions",
+        "project_url",
     ]
     try:
         data = plugin_summaries()

{napari_plugin_manager-0.1.5rc0 → napari_plugin_manager-0.1.6}/src/napari_plugin_manager/_tests/test_qt_plugin_dialog.py

@@ -467,6 +467,11 @@ def test_drop_event(plugin_dialog, tmp_path):
     assert plugin_dialog.direct_entry_edit.text() == str(path_1)
 
 
+@pytest.mark.skipif(
+    'napari_latest' in os.getenv('TOX_ENV_NAME')
+    and 'PySide2' in os.getenv('TOX_ENV_NAME'),
+    reason='PySide2 flaky with latest released napari',
+)
 def test_installs(qtbot, tmp_virtualenv, plugin_dialog, request):
     if "[constructor]" in request.node.name:
         pytest.skip(

napari_plugin_manager-0.1.6/src/napari_plugin_manager/_tests/test_utils.py

@@ -0,0 +1,58 @@
+import sys
+from unittest.mock import patch
+
+import pytest
+
+from napari_plugin_manager.utils import get_homepage_url, is_conda_package
+
+
+@pytest.mark.parametrize(
+    "pkg_name,expected",
+    [
+        ("some-package", True),
+        ("some-other-package", False),
+        ("some-package-other", False),
+        ("other-some-package", False),
+        ("package", False),
+        ("some", False),
+    ],
+)
+def test_is_conda_package(pkg_name, expected, tmp_path):
+    mocked_conda_meta = tmp_path / 'conda-meta'
+    mocked_conda_meta.mkdir()
+    mocked_package = mocked_conda_meta / 'some-package-0.1.1-0.json'
+    mocked_package.touch()
+
+    with patch.object(sys, 'prefix', tmp_path):
+        assert is_conda_package(pkg_name) is expected
+
+
+def test_get_homepage_url():
+    assert get_homepage_url({}) == ''
+
+    meta = {
+        'Home-page': None,
+    }
+    assert get_homepage_url(meta) == ''
+
+    meta['Home-page'] = 'http://example.com'
+    assert get_homepage_url(meta) == 'http://example.com'
+
+    meta['Project-URL'] = ['Home Page, http://projurl.com']
+    assert get_homepage_url(meta) == 'http://example.com'
+
+    meta['home_page'] = meta.pop('Home-page')
+    meta['project_url'] = meta.pop('Project-URL')
+    assert get_homepage_url(meta) == 'http://example.com'
+
+    meta['home_page'] = None
+    assert get_homepage_url(meta) == 'http://projurl.com'
+
+    meta['project_url'] = ['Source Code, http://projurl.com']
+    assert get_homepage_url(meta) == 'http://projurl.com'
+
+    meta['project_url'] = ['Source, http://projurl.com']
+    assert get_homepage_url(meta) == 'http://projurl.com'
+
+    meta['project_url'] = None
+    assert get_homepage_url(meta) == ''

{napari_plugin_manager-0.1.5rc0 → napari_plugin_manager-0.1.6}/src/napari_plugin_manager/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.5rc0'
-__version_tuple__ = version_tuple = (0, 1, 5)
+__version__ = version = '0.1.6'
+__version_tuple__ = version_tuple = (0, 1, 6)

{napari_plugin_manager-0.1.5rc0 → napari_plugin_manager-0.1.6}/src/napari_plugin_manager/base_qt_package_installer.py

@@ -23,7 +23,7 @@ from logging import getLogger
 from pathlib import Path
 from subprocess import call
 from tempfile import gettempdir
-from typing import TypedDict
+from typing import Optional, TypedDict
 
 from napari.plugins import plugin_manager
 from napari.plugins.npe2api import _user_agent
@@ -636,8 +636,8 @@ class InstallerQueue(QObject):
     def _on_process_done(
         self,
         exit_code: int | None = None,
-        exit_status: QProcess.ExitStatus | None = None,
-        error: QProcess.ProcessError | None = None,
+        exit_status: Optional[QProcess.ExitStatus] = None,  # noqa
+        error: Optional[QProcess.ProcessError] = None,  # noqa
     ):
         item = None
         with contextlib.suppress(IndexError):

{napari_plugin_manager-0.1.5rc0 → napari_plugin_manager-0.1.6}/src/napari_plugin_manager/base_qt_plugin_dialog.py

@@ -53,7 +53,7 @@ from napari_plugin_manager.base_qt_package_installer import (
 )
 from napari_plugin_manager.qt_warning_dialog import RestartWarningDialog
 from napari_plugin_manager.qt_widgets import ClickableLabel
-from napari_plugin_manager.utils import is_conda_package
+from napari_plugin_manager.utils import get_homepage_url, is_conda_package
 
 CONDA = 'Conda'
 PYPI = 'PyPI'
@@ -1225,7 +1225,8 @@ class BaseQtPluginDialog(QDialog):
             self.already_installed.add(norm_name)
         else:
             meta = {}
-
+        meta_dict = meta if isinstance(meta, dict) else meta.json
+        home_page = get_homepage_url(meta_dict)
         self.installed_list.addItem(
             self.PROJECT_INFO_VERSION_CLASS(
                 display_name=norm_name,
@@ -1236,7 +1237,7 @@ class BaseQtPluginDialog(QDialog):
                     name=norm_name,
                     version=meta.get('version', ''),
                     summary=meta.get('summary', ''),
-                    home_page=meta.get('Home-page', ''),
+                    home_page=home_page,
                     author=meta.get('author', ''),
                     license=meta.get('license', ''),
                 ),

{napari_plugin_manager-0.1.5rc0 → napari_plugin_manager-0.1.6}/src/napari_plugin_manager/npe2api.py

@@ -19,6 +19,8 @@ from napari.utils.notifications import show_warning
 from npe2 import PackageMetadata
 from typing_extensions import NotRequired
 
+from napari_plugin_manager.utils import get_homepage_url
+
 PyPIname = str
 
 
@@ -98,12 +100,15 @@ def iter_napari_plugin_info() -> Iterator[tuple[PackageMetadata, bool, dict]]:
 
     conda_set = {normalized_name(x) for x in conda}
     for info in data_set:
-        info_copy = dict(info)
+        info_copy: dict[str, str | list[str]] = dict(info)
         info_copy.pop('display_name', None)
         pypi_versions = info_copy.pop('pypi_versions')
         conda_versions = info_copy.pop('conda_versions')
         info_ = cast(_ShortSummaryDict, info_copy)
-
+        home_page = get_homepage_url(info_copy)
+        # this URL is used for the widget, so we have to replace the home_page
+        # link here as well as returning it in extra_info
+        info_['home_page'] = home_page
         # TODO: use this better.
         # this would require changing the api that qt_plugin_dialog expects to
         # receive
@@ -111,7 +116,7 @@ def iter_napari_plugin_info() -> Iterator[tuple[PackageMetadata, bool, dict]]:
         # TODO: once the new version of npe2 is out, this can be refactored
         # to all the metadata includes the conda and pypi versions.
         extra_info = {
-            'home_page': info_.get('home_page', ''),
+            'home_page': home_page,
             'display_name': info.get('display_name', ''),
             'pypi_versions': pypi_versions,
             'conda_versions': conda_versions,

napari_plugin_manager-0.1.6/src/napari_plugin_manager/utils.py

@@ -0,0 +1,76 @@
+import re
+import string
+import sys
+from pathlib import Path
+
+
+def is_conda_package(pkg: str, prefix: str | None = None) -> bool:
+    """Determines if plugin was installed through conda.
+
+    Returns
+    -------
+    bool
+        ``True` if a conda package, ``False`` if not.
+    """
+    # Installed conda packages within a conda installation and environment can
+    # be identified as files with the template ``<package-name>-<version>-<build-string>.json``
+    # saved within a ``conda-meta`` folder within the given environment of interest.
+    conda_meta_dir = Path(prefix or sys.prefix) / 'conda-meta'
+    return any(
+        re.match(rf"{pkg}-[^-]+-[^-]+.json", p.name)
+        for p in conda_meta_dir.glob(f"{pkg}-*-*.json")
+    )
+
+
+def normalize_label(label: str) -> str:
+    """Normalize project URL label.
+
+    Code reproduced from:
+    https://packaging.python.org/en/latest/specifications/well-known-project-urls/#label-normalization
+    """
+    chars_to_remove = string.punctuation + string.whitespace
+    removal_map = str.maketrans("", "", chars_to_remove)
+    return label.translate(removal_map).lower()
+
+
+def get_homepage_url(metadata: dict[str, str | list[str] | None]) -> str:
+    """Get URL for package homepage, if available.
+
+    Checks metadata first for `Home-page` field before
+    looking for `Project-URL` 'homepage' label and finally
+    'source'/'sourcecode' label.
+
+    Parameters
+    ----------
+    metadata : dict[str, str | list[str] | None]
+        Package metadata information.
+
+    Returns
+    -------
+    str
+        Returns homepage URL if present, otherwise empty string.
+    """
+    if not len(metadata):
+        return ''
+
+    homepage = metadata.get('Home-page', '') or metadata.get('home_page', '')
+    if isinstance(homepage, str) and len(homepage):
+        return homepage
+
+    urls = {}
+    project_urls = metadata.get('Project-URL', []) or metadata.get(
+        'project_url', []
+    )
+    if project_urls is None:
+        return ''
+
+    for url_info in project_urls:
+        label, url = url_info.split(', ')
+        urls[normalize_label(label)] = url
+
+    homepage = (
+        urls.get('homepage', '')
+        or urls.get('source', '')
+        or urls.get('sourcecode', '')
+    )
+    return homepage

{napari_plugin_manager-0.1.5rc0 → napari_plugin_manager-0.1.6}/src/napari_plugin_manager.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: napari-plugin-manager
-Version: 0.1.5rc0
+Version: 0.1.6
 Summary: Install plugins for napari, in napari.
 Author-email: napari team <napari-steering-council@googlegroups.com>
 License: BSD 3-Clause License

{napari_plugin_manager-0.1.5rc0 → napari_plugin_manager-0.1.6}/tox.ini

@@ -30,6 +30,9 @@ passenv =
     NUMPY_EXPERIMENTAL_ARRAY_FUNCTION
     PYVISTA_OFF_SCREEN
 
+setenv = 
+    TOX_ENV_NAME = {envname}
+
 deps = 
     napari_repo: git+https://github.com/napari/napari.git
 extras = testing

napari_plugin_manager-0.1.5rc0/src/napari_plugin_manager/_tests/test_utils.py

@@ -1,27 +0,0 @@
-import sys
-from unittest.mock import patch
-
-import pytest
-
-from napari_plugin_manager.utils import is_conda_package
-
-
-@pytest.mark.parametrize(
-    "pkg_name,expected",
-    [
-        ("some-package", True),
-        ("some-other-package", False),
-        ("some-package-other", False),
-        ("other-some-package", False),
-        ("package", False),
-        ("some", False),
-    ],
-)
-def test_is_conda_package(pkg_name, expected, tmp_path):
-    mocked_conda_meta = tmp_path / 'conda-meta'
-    mocked_conda_meta.mkdir()
-    mocked_package = mocked_conda_meta / 'some-package-0.1.1-0.json'
-    mocked_package.touch()
-
-    with patch.object(sys, 'prefix', tmp_path):
-        assert is_conda_package(pkg_name) is expected

napari_plugin_manager-0.1.5rc0/src/napari_plugin_manager/utils.py

@@ -1,21 +0,0 @@
-import re
-import sys
-from pathlib import Path
-
-
-def is_conda_package(pkg: str, prefix: str | None = None) -> bool:
-    """Determines if plugin was installed through conda.
-
-    Returns
-    -------
-    bool
-        ``True` if a conda package, ``False`` if not.
-    """
-    # Installed conda packages within a conda installation and environment can
-    # be identified as files with the template ``<package-name>-<version>-<build-string>.json``
-    # saved within a ``conda-meta`` folder within the given environment of interest.
-    conda_meta_dir = Path(prefix or sys.prefix) / 'conda-meta'
-    return any(
-        re.match(rf"{pkg}-[^-]+-[^-]+.json", p.name)
-        for p in conda_meta_dir.glob(f"{pkg}-*-*.json")
-    )