napari-plugin-manager 0.1.9__tar.gz → 0.1.10rc0__tar.gz

{napari_plugin_manager-0.1.9 → napari_plugin_manager-0.1.10rc0}/.github/workflows/deploy_docs.yml

@@ -26,9 +26,9 @@ jobs:
 
     steps:
     - name: Clone repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-    - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+    - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
       with:
         python-version: "3.10"
 
@@ -52,7 +52,7 @@ jobs:
 
     # At a minimum this job should upload artifacts using actions/upload-pages-artifact
     - name: Upload GitHub Pages artifact
-      uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1
+      uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4.0.0
       with:
         name: github-pages
         path: docs/_build

{napari_plugin_manager-0.1.9 → napari_plugin_manager-0.1.10rc0}/.github/workflows/test_and_deploy.yml

@@ -30,9 +30,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest, windows-latest, macos-15-intel, macos-latest]
-        python-version: ["3.10", "3.11", "3.12"]
-        napari: ["latest", "repo"]
+        platform: [ubuntu-latest, windows-latest, macos-latest]
+        python-version: ["3.10", "3.12"]
+        napari: ["latest", "repo", '0.6.6']
         tool: ["pip", "conda"]
         include:
           # add 3.13 on ubuntu
@@ -40,6 +40,15 @@ jobs:
             napari: repo
             tool: pip
             python-version: "3.13"
+          # only run macos intel on py3.12
+          - platform: macos-15-intel
+            napari: repo
+            tool: pip
+            python-version: "3.12"
+          - platform: macos-15-intel
+            napari: repo
+            tool: conda
+            python-version: "3.12"
         exclude:
         # skip repo install on conda
         - platform: ubuntu-latest
@@ -53,17 +62,17 @@ jobs:
           napari: repo
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Set up Python ${{ matrix.python-version }} - pip
         if: matrix.tool == 'pip'
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Set up Python ${{ matrix.python-version }} - conda
         if: matrix.tool == 'conda'
-        uses: conda-incubator/setup-miniconda@835234971496cad1653abb28a638a281cf32541f # v3.2.0
+        uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3.3.0
         with:
           miniforge-version: latest
           channels: conda-forge
@@ -109,7 +118,7 @@ jobs:
 
 
       - name: Upload coverage data
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: coverage reports ${{ matrix.platform }} py ${{ matrix.python-version }} ${{ matrix.tool }} ${{ matrix.napari }}
           include-hidden-files: true
@@ -126,9 +135,9 @@ jobs:
     if: always()
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
           python-version: "3.x"
           cache-dependency-path: pyproject.toml
@@ -140,7 +149,7 @@ jobs:
           pip install codecov
 
       - name: Download coverage data
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           pattern: coverage reports*
           path: coverage
@@ -156,7 +165,7 @@ jobs:
           python -Im coverage report --format=markdown --skip-empty --skip-covered >> "$GITHUB_STEP_SUMMARY"
 
       - name: Upload coverage data
-        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
+        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
         with:
           fail_ci_if_error: true
           use_oidc: ${{ github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) }}
@@ -170,9 +179,9 @@ jobs:
     permissions:
       id-token: write
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Set up Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
           python-version: "3.x"
       - name: Install dependencies
@@ -184,4 +193,4 @@ jobs:
           git tag
           python -m build
       - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
+        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0

{napari_plugin_manager-0.1.9 → napari_plugin_manager-0.1.10rc0}/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-docstring-first
         exclude: ^constructor-manager-ui/src/constructor_manager_ui/style/images.py
@@ -9,13 +9,13 @@ repos:
       - id: trailing-whitespace
         exclude: ^constructor-manager-ui/src/constructor_manager_ui/style/images.py
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.7
+    rev: v0.14.14
     hooks:
       - id: ruff-check
         args: [--fix]
       - id: ruff-format
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.33.2
+    rev: 0.36.1
     hooks:
       - id: check-github-workflows
 

{napari_plugin_manager-0.1.9 → napari_plugin_manager-0.1.10rc0}/PKG-INFO

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

{napari_plugin_manager-0.1.9 → napari_plugin_manager-0.1.10rc0}/pyproject.toml

@@ -93,7 +93,7 @@ docs = [
 homepage = "https://github.com/napari/napari-plugin-manager"
 
 [tool.black]
-target-version = ['py310', 'py311', 'py312', 'py313']
+target-version = ['py310', 'py312', 'py313']
 skip-string-normalization = true
 line-length = 79
 

{napari_plugin_manager-0.1.9 → napari_plugin_manager-0.1.10rc0}/src/napari_plugin_manager/_tests/test_installer_process.py

@@ -261,7 +261,7 @@ def test_conda_installer(qtbot, caplog, monkeypatch, tmp_conda_env: Path):
     caplog.set_level(logging.DEBUG, logger=bqpi.__name__)
     conda_meta = tmp_conda_env / 'conda-meta'
     glob_pat = 'typing-extensions-*.json'
-    glob_pat_2 = 'packaging-*.json'
+    glob_pat_2 = 'cowpy-*.json'
     installer = NapariInstallerQueue()
 
     with qtbot.waitSignal(installer.allFinished, timeout=600_000):
@@ -293,7 +293,7 @@ def test_conda_installer(qtbot, caplog, monkeypatch, tmp_conda_env: Path):
         )
         installer.install(
             tool=InstallerTools.CONDA,
-            pkgs=['packaging'],
+            pkgs=['cowpy'],
             prefix=tmp_conda_env,
         )
         assert installer.currentJobs() == 2
@@ -312,7 +312,7 @@ def test_conda_installer(qtbot, caplog, monkeypatch, tmp_conda_env: Path):
         )
         job_id_2 = installer.install(
             tool=InstallerTools.CONDA,
-            pkgs=['packaging'],
+            pkgs=['cowpy'],
             prefix=tmp_conda_env,
         )
         assert installer.currentJobs() == 2
@@ -330,7 +330,7 @@ def test_conda_installer(qtbot, caplog, monkeypatch, tmp_conda_env: Path):
         )
         job_id_2 = installer.install(
             tool=InstallerTools.CONDA,
-            pkgs=['packaging'],
+            pkgs=['cowpy'],
             prefix=tmp_conda_env,
         )
         assert installer.currentJobs() == 2
@@ -370,7 +370,7 @@ def test_conda_installer_wait_for_finished(qtbot, tmp_conda_env: Path):
         )
         installer.install(
             tool=InstallerTools.CONDA,
-            pkgs=['packaging'],
+            pkgs=['cowpy'],
             prefix=tmp_conda_env,
         )
         installer.waitForFinished(30_000)

{napari_plugin_manager-0.1.9 → napari_plugin_manager-0.1.10rc0}/src/napari_plugin_manager/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.9'
-__version_tuple__ = version_tuple = (0, 1, 9)
+__version__ = version = '0.1.10rc0'
+__version_tuple__ = version_tuple = (0, 1, 10, 'rc0')
 
-__commit_id__ = commit_id = 'g3e3e1a4bc'
+__commit_id__ = commit_id = 'gcad2c38d0'

{napari_plugin_manager-0.1.9 → napari_plugin_manager-0.1.10rc0}/src/napari_plugin_manager/base_qt_package_installer.py

@@ -26,7 +26,6 @@ from subprocess import run
 from tempfile import gettempdir
 from typing import TypedDict
 
-from napari.plugins import plugin_manager
 from napari.plugins.npe2api import _user_agent
 from napari.utils.misc import StringEnum
 from napari.utils.translations import trans
@@ -694,7 +693,15 @@ class InstallerQueue(QObject):
             and exit_code == 0
         ):
             pm2 = PluginManager.instance()
-            npe1_plugins = set(plugin_manager.iter_available())
+            # new versions of napari after 0.7.0 won't have the plugin_manager
+            # this try/except block is to maintain compatibility
+            # between new napari-plugin-manager versions and old napari versions
+            try:
+                from napari.plugins import plugin_manager
+
+                npe1_plugins = set(plugin_manager.iter_available())
+            except ImportError:
+                npe1_plugins = set()
             for pkg in current.pkgs:
                 if pkg in pm2:
                     pm2.unregister(pkg)

{napari_plugin_manager-0.1.9 → napari_plugin_manager-0.1.10rc0}/src/napari_plugin_manager/base_qt_plugin_dialog.py

@@ -1471,13 +1471,10 @@ class BaseQtPluginDialog(QDialog):
         self.working_indicator.setMovie(mov)
         mov.start()
 
-        visibility_direct_entry = not self._on_bundle()
         self.direct_entry_edit = QLineEdit(self)
         self.direct_entry_edit.installEventFilter(self)
         self.direct_entry_edit.returnPressed.connect(self._install_packages)
-        self.direct_entry_edit.setVisible(visibility_direct_entry)
         self.direct_entry_btn = QToolButton(self)
-        self.direct_entry_btn.setVisible(visibility_direct_entry)
         self.direct_entry_btn.clicked.connect(self._install_packages)
         self.direct_entry_btn.setText(self._trans('Install'))
 
@@ -1518,8 +1515,6 @@ class BaseQtPluginDialog(QDialog):
 
         buttonBox.addWidget(self.direct_entry_edit)
         buttonBox.addWidget(self.direct_entry_btn)
-        if not visibility_direct_entry:
-            buttonBox.addStretch()
         buttonBox.addWidget(self.process_success_indicator)
         buttonBox.addWidget(self.process_error_indicator)
         buttonBox.addWidget(self.show_status_btn)

{napari_plugin_manager-0.1.9 → napari_plugin_manager-0.1.10rc0}/src/napari_plugin_manager/npe2api.py

@@ -23,6 +23,10 @@ from napari_plugin_manager.utils import get_homepage_url
 
 PyPIname = str
 
+BASE_API_URL = 'https://api.napari.org/api'
+EXTENDED_SUMMARY_URL = f'{BASE_API_URL}/extended_summary'
+CONDA_URL = f'{BASE_API_URL}/conda'
+
 
 @lru_cache
 def _user_agent() -> str:
@@ -51,7 +55,7 @@ def _user_agent() -> str:
 
 
 class _ShortSummaryDict(TypedDict):
-    """Objects returned at https://npe2api.vercel.app/api/extended_summary ."""
+    """Objects returned from API extended_summary endpoint."""
 
     name: NotRequired[PyPIname]
     version: str
@@ -70,16 +74,18 @@ class SummaryDict(_ShortSummaryDict):
 @lru_cache
 def plugin_summaries() -> list[SummaryDict]:
     """Return PackageMetadata object for all known napari plugins."""
-    url = 'https://npe2api.vercel.app/api/extended_summary'
-    with urlopen(Request(url, headers={'User-Agent': _user_agent()})) as resp:
+    with urlopen(
+        Request(EXTENDED_SUMMARY_URL, headers={'User-Agent': _user_agent()})
+    ) as resp:
         return json.load(resp)
 
 
 @lru_cache
 def conda_map() -> dict[PyPIname, str | None]:
     """Return map of PyPI package name to conda_channel/package_name ()."""
-    url = 'https://npe2api.vercel.app/api/conda'
-    with urlopen(Request(url, headers={'User-Agent': _user_agent()})) as resp:
+    with urlopen(
+        Request(CONDA_URL, headers={'User-Agent': _user_agent()})
+    ) as resp:
         return json.load(resp)
 
 

{napari_plugin_manager-0.1.9 → napari_plugin_manager-0.1.10rc0}/src/napari_plugin_manager/qt_plugin_dialog.py

@@ -104,12 +104,20 @@ class PluginListItem(BasePluginListItem):
         if plugin_name in pm2:
             pm2.enable(plugin_name) if state else pm2.disable(plugin_name)
             return
-
+        # new versions of napari after 0.7.0 won't have the plugin_manager
+        # this try/except block is to maintain compatibility
+        # between new napari-plugin-manager versions and old napari versions
+        try:
+            from napari.plugins import plugin_manager
+
+            npe1_plugins = set(plugin_manager.iter_available())
+        except ImportError:
+            npe1_plugins = set()
         for (
             npe1_name,
             _,
             distname,
-        ) in napari.plugins.plugin_manager.iter_available():
+        ) in npe1_plugins:
             if distname and (normalized_name(distname) == plugin_name):
                 napari.plugins.plugin_manager.set_blocked(
                     npe1_name, not enabled

{napari_plugin_manager-0.1.9 → napari_plugin_manager-0.1.10rc0}/src/napari_plugin_manager.egg-info/PKG-INFO

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

{napari_plugin_manager-0.1.9 → napari_plugin_manager-0.1.10rc0}/tox.ini

@@ -1,13 +1,12 @@
 # For more information about tox, see https://tox.readthedocs.io/en/latest/
 [tox]
-envlist = pip-py{310,311,312,313}-{PyQt5,PyQt6,PySide6}-napari_{latest,repo}, conda-{py310,py311,py312,py313}-{PyQt5,PySide6}-napari_{latest,repo}
+envlist = pip-py{310,312,313}-{PyQt5,PyQt6,PySide6}-napari_{latest,repo,066}, conda-{py310,py312,py313}-{PyQt5,PySide6}-napari_{latest,repo,066}
 toxworkdir=/tmp/.tox
 isolated_build = true
 
 [gh-actions]
 python =
     3.10: py310
-    3.11: py311
     3.12: py312
     3.13: py313
 
@@ -15,6 +14,7 @@ python =
 NAPARI =
     latest: napari_latest
     repo: napari_repo
+    0.6.6: napari_066
 TOOL =
     pip: pip
     conda: conda
@@ -39,19 +39,21 @@ extras = testing
 commands = coverage run --parallel-mode -m pytest -v --color=yes
 
 # Conditional PIP dependencies based on environment variables
-[testenv:pip-{py310,py311,py312,py313}-{PyQt5,PyQt6,PySide6}-napari_{latest,repo}]
+[testenv:pip-{py310,py312,py313}-{PyQt5,PyQt6,PySide6}-napari_{latest,repo,066}]
 deps =
     PyQt5: PyQt5
     PyQt5: PyQt5-sip
     PyQt6: PyQt6
     PySide6: PySide6 > 6.7
     napari_latest: napari
+    napari_066: napari==0.6.6
     napari_repo: git+https://github.com/napari/napari.git
 
 
 # Conditional dependencies for CONDA
-[testenv:conda-{py310,py311,py312}-{PyQt5,PySide6}-napari_{latest,repo}]
+[testenv:conda-{py310,py312}-{PyQt5,PySide6}-napari_{latest,repo,066}]
 conda_deps =
-    {py310,py311,py312}-PyQt5: pyqt
+    {py310,py312}-PyQt5: pyqt
     PySide6: pyside6 > 6.7
     napari_latest: napari
+    napari_066: napari==0.6.6