napari-plugin-manager 0.1.7__tar.gz → 0.1.8rc0__tar.gz

{napari_plugin_manager-0.1.7 → napari_plugin_manager-0.1.8rc0}/.github/workflows/deploy_docs.yml

@@ -32,7 +32,11 @@ jobs:
       with:
         python-version: "3.10"
 
-    - uses: tlambert03/setup-qt-libs@19e4ef2d781d81f5f067182e228b54ec90d23b76 # v1.8
+    - name: Setup headless display
+      uses: pyvista/setup-headless-display-action@7d84ae825e6d9297a8e99bdbbae20d1b919a0b19 # v4.2
+      with:
+        qt: true
+        wm: herbstluftwm
 
     - name: Install Dependencies
       run: |
@@ -41,9 +45,7 @@ jobs:
         python -m pip install -e ".[docs]"
 
     - name: Build Docs
-      uses: aganders3/headless-gui@f85dd6316993505dfc5f21839d520ae440c84816 # v2.2
-      with:
-        run: make docs
+      run: make docs
 
     - name: Check file tree contents
       run: tree

{napari_plugin_manager-0.1.7 → napari_plugin_manager-0.1.8rc0}/.github/workflows/test_and_deploy.yml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest, windows-latest, macos-13, macos-latest]
+        platform: [ubuntu-latest, windows-latest, macos-15-intel, macos-latest]
         python-version: ["3.10", "3.11", "3.12"]
         napari: ["latest", "repo"]
         tool: ["pip", "conda"]
@@ -47,7 +47,7 @@ jobs:
           tool: conda
         - platform: windows-latest
           napari: repo
-        - platform: macos-13
+        - platform: macos-15-intel
           napari: repo
         - platform: macos-latest
           napari: repo
@@ -70,15 +70,11 @@ jobs:
           conda-remove-defaults: "true"
           python-version: ${{ matrix.python-version }}
 
-      - uses: tlambert03/setup-qt-libs@19e4ef2d781d81f5f067182e228b54ec90d23b76 # v1.8
-
-      # strategy borrowed from vispy for installing opengl libs on windows
-      - name: Install Windows OpenGL
-        if: runner.os == 'Windows'
-        run: |
-          git clone --depth 1 https://github.com/pyvista/gl-ci-helpers.git
-          powershell gl-ci-helpers/appveyor/install_opengl.ps1
-          if (Test-Path -Path "C:\Windows\system32\opengl32.dll" -PathType Leaf) {Exit 0} else {Exit 1}
+      - name: Setup headless display
+        uses: pyvista/setup-headless-display-action@7d84ae825e6d9297a8e99bdbbae20d1b919a0b19 # v4.2
+        with:
+          qt: true
+          wm: herbstluftwm
 
       - name: Install dependencies without tox-conda
         if: matrix.tool == 'pip'
@@ -95,9 +91,7 @@ jobs:
 
       - name: Test with tox - pip
         if: matrix.tool == 'pip'
-        uses: aganders3/headless-gui@f85dd6316993505dfc5f21839d520ae440c84816 # v2.2
-        with:
-          run: python -m tox
+        run: python -m tox
         env:
           PYVISTA_OFF_SCREEN: True  # required for opengl on windows
           NAPARI: ${{ matrix.napari }}
@@ -105,18 +99,13 @@ jobs:
           FORCE_COLOR: 1
       - name: Test with tox - conda
         if: matrix.tool == 'conda'
-        uses: aganders3/headless-gui@f85dd6316993505dfc5f21839d520ae440c84816 # v2.2
-        with:
-          shell: bash -el {0}
-          run: python -m tox
+        shell: bash -el {0}
+        run: python -m tox
         env:
           PYVISTA_OFF_SCREEN: True  # required for opengl on windows
           NAPARI: ${{ matrix.napari }}
           TOOL: ${{ matrix.tool }}
           FORCE_COLOR: 1
-          # Only supported pyside2 and pyside6 are not supported on py312, py313
-          # no Qt backends supported by conda-forge on py313
-          TOX_SKIP_ENV: ".*py31[23].*PySide2|.*py313.*conda"
 
 
       - name: Upload coverage data

{napari_plugin_manager-0.1.7 → napari_plugin_manager-0.1.8rc0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: napari-plugin-manager
-Version: 0.1.7
+Version: 0.1.8rc0
 Summary: Install plugins for napari, in napari.
 Author-email: napari team <napari-steering-council@googlegroups.com>
 License-Expression: BSD-3-Clause
@@ -29,7 +29,6 @@ Classifier: Operating System :: MacOS
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: napari
 Requires-Dist: npe2
 Requires-Dist: qtpy
 Requires-Dist: superqt
@@ -45,7 +44,7 @@ Requires-Dist: napari-plugin-manager[uv]; extra == "testing"
 Requires-Dist: coverage; extra == "testing"
 Requires-Dist: flaky; extra == "testing"
 Requires-Dist: pytest; extra == "testing"
-Requires-Dist: pytest-qt<4.5; extra == "testing"
+Requires-Dist: pytest-qt; extra == "testing"
 Requires-Dist: virtualenv; extra == "testing"
 Provides-Extra: docs
 Requires-Dist: sphinx>6; extra == "docs"

{napari_plugin_manager-0.1.7 → napari_plugin_manager-0.1.8rc0}/pyproject.toml

@@ -50,7 +50,7 @@ classifiers = [
 ]
 requires-python = ">=3.10"
 dependencies = [
-  "napari",  # FUTURE: Fully decouple from napari
+  # "napari",  # FUTURE: Fully decouple from napari # bug in uv create problem with constraints files https://github.com/astral-sh/uv/issues/16372
   "npe2",
   "qtpy",
   "superqt",
@@ -75,7 +75,7 @@ testing = [
   "coverage",
   "flaky",
   "pytest",
-  "pytest-qt<4.5",  # FUTURE: Unpin once pyside2 is dropped
+  "pytest-qt",
   "virtualenv"
 ]
 

{napari_plugin_manager-0.1.7 → napari_plugin_manager-0.1.8rc0}/src/napari_plugin_manager/_tests/test_installer_process.py

@@ -147,7 +147,8 @@ def test_pip_installer_tasks(
         )
     process_finished_data = blocker.args[0]
     assert process_finished_data['action'] == InstallerActions.INSTALL
-    assert process_finished_data['pkgs'] == ('pydantic',)
+    assert tuple(process_finished_data['pkgs']) == ('pydantic',)
+    # It look like Pydantic6 converts tuples to lists
 
     # Test upgrade
     with qtbot.waitSignal(installer.allFinished, timeout=30_000):

{napari_plugin_manager-0.1.7 → napari_plugin_manager-0.1.8rc0}/src/napari_plugin_manager/_tests/test_qt_plugin_dialog.py

@@ -7,7 +7,6 @@ from unittest.mock import MagicMock, call, patch
 import napari.plugins
 import npe2
 import pytest
-import qtpy
 from napari.plugins._tests.test_npe2 import mock_pm  # noqa
 from napari.utils.translations import trans
 from qtpy.QtCore import QMimeData, QPointF, Qt, QTimer, QUrl
@@ -17,13 +16,6 @@ from qtpy.QtWidgets import (
     QMessageBox,
 )
 
-if qtpy.API_NAME == 'PySide2' and sys.version_info[:2] > (3, 10):
-    pytest.skip(
-        'Known PySide2 x Python incompatibility: '
-        '... object cannot be interpreted as an integer',
-        allow_module_level=True,
-    )
-
 from napari_plugin_manager import base_qt_plugin_dialog, qt_plugin_dialog
 from napari_plugin_manager.base_qt_package_installer import (
     InstallerActions,
@@ -105,10 +97,6 @@ def plugin_dialog(
     old_plugins,
 ):
     """Fixture that provides a plugin dialog for a normal napari install."""
-    from napari.settings import get_settings
-
-    original_setting = get_settings().plugins.use_npe2_adaptor
-    get_settings().plugins.use_npe2_adaptor = False
 
     class PluginManagerMock:
         def instance(self):
@@ -127,7 +115,7 @@ def plugin_dialog(
         def is_disabled(self, name):
             return False
 
-        def discover(self, include_npe1=False):
+        def discover(self, include_npe1=True):
             return ['plugin']
 
         def enable(self, plugin):
@@ -207,7 +195,6 @@ def plugin_dialog(
     if widget.worker is not None:
         widget.worker.quit()
     assert not widget._add_items_timer.isActive()
-    get_settings().plugins.use_npe2_adaptor = original_setting
 
 
 def test_filter_not_available_plugins(request, plugin_dialog, qtbot):
@@ -221,16 +208,15 @@ def test_filter_not_available_plugins(request, plugin_dialog, qtbot):
         )
     plugin_dialog.search('e')
     qtbot.wait(500)
-    item = plugin_dialog.available_list.item(0)
-    widget = plugin_dialog.available_list.itemWidget(item)
-    if widget:
-        assert not widget.action_button.isEnabled()
-        assert widget.warning_tooltip.isVisible()
-
-    item = plugin_dialog.available_list.item(1)
-    widget = plugin_dialog.available_list.itemWidget(item)
-    assert widget.action_button.isEnabled()
-    assert not widget.warning_tooltip.isVisible()
+    for i in range(plugin_dialog.available_list.count()):
+        item = plugin_dialog.available_list.item(i)
+        widget = plugin_dialog.available_list.itemWidget(item)
+        if widget and widget.name == 'packaging':
+            assert not widget.action_button.isEnabled()
+            assert widget.warning_tooltip.isVisible()
+        else:
+            assert widget.action_button.isEnabled()
+            assert not widget.warning_tooltip.isVisible()
 
 
 def test_filter_available_plugins(plugin_dialog, qtbot):
@@ -260,7 +246,7 @@ def test_filter_installed_plugins(plugin_dialog, qtbot):
     """
     plugin_dialog.search('')
     qtbot.wait(500)
-    assert plugin_dialog.installed_list.count_visible() == 2
+    assert plugin_dialog.installed_list.count_visible() == 1
 
     plugin_dialog.search('no-match@123')
     qtbot.wait(500)
@@ -295,7 +281,7 @@ def test_version_dropdown(plugin_dialog, qtbot):
 
 
 def test_plugin_list_count_items(plugin_dialog):
-    assert plugin_dialog.installed_list.count_visible() == 2
+    assert plugin_dialog.installed_list.count_visible() == 1
 
 
 def test_plugin_list_handle_action(plugin_dialog, qtbot):
@@ -361,15 +347,6 @@ def test_on_enabled_checkbox(plugin_dialog, qtbot, plugins, old_plugins):
         widget.enabled_checkbox.setChecked(False)
     assert plugins.plugins['my-plugin'] is False
 
-    # checks npe1 lines
-    item = plugin_dialog.installed_list.item(1)
-    widget = plugin_dialog.installed_list.itemWidget(item)
-
-    assert old_plugins.enabled[0] is True
-    with qtbot.waitSignal(widget.enabled_checkbox.stateChanged, timeout=500):
-        widget.enabled_checkbox.setChecked(False)
-    assert old_plugins.enabled[0] is False
-
 
 def test_add_items_outdated_and_update(plugin_dialog, qtbot):
     """
@@ -465,11 +442,6 @@ 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(
@@ -554,7 +526,7 @@ def test_cancel(qtbot, tmp_virtualenv, plugin_dialog, request):
     assert process_finished_data['action'] == InstallerActions.CANCEL
     assert process_finished_data['pkgs'][0].startswith('requests')
     assert plugin_dialog.available_list.count() == 1
-    assert plugin_dialog.installed_list.count() == 2
+    assert plugin_dialog.installed_list.count() == 1
 
 
 def test_cancel_all(qtbot, tmp_virtualenv, plugin_dialog, request):
@@ -581,7 +553,7 @@ def test_cancel_all(qtbot, tmp_virtualenv, plugin_dialog, request):
     qtbot.wait(500)
 
     assert plugin_dialog.available_list.count() == 2
-    assert plugin_dialog.installed_list.count() == 2
+    assert plugin_dialog.installed_list.count() == 1
 
 
 def test_direct_entry_installs(qtbot, tmp_virtualenv, plugin_dialog, request):

{napari_plugin_manager-0.1.7 → napari_plugin_manager-0.1.8rc0}/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.7'
-__version_tuple__ = version_tuple = (0, 1, 7)
+__version__ = version = '0.1.8rc0'
+__version_tuple__ = version_tuple = (0, 1, 8, 'rc0')
 
-__commit_id__ = commit_id = 'g4adeb1d86'
+__commit_id__ = commit_id = 'g3e3e1a4bc'

{napari_plugin_manager-0.1.7 → napari_plugin_manager-0.1.8rc0}/src/napari_plugin_manager/base_qt_package_installer.py

@@ -10,6 +10,8 @@ Available actions for each tool are `install`, `uninstall`
 and `cancel`.
 """
 
+from __future__ import annotations
+
 import contextlib
 import os
 import sys
@@ -407,7 +409,7 @@ class InstallerQueue(QObject):
         item = self._build_queue_item(
             tool=tool,
             action=InstallerActions.INSTALL,
-            pkgs=pkgs,
+            pkgs=tuple(pkgs),
             prefix=prefix,
             origins=origins,
             process=self._create_process(),
@@ -448,7 +450,7 @@ class InstallerQueue(QObject):
         item = self._build_queue_item(
             tool=tool,
             action=InstallerActions.UPGRADE,
-            pkgs=pkgs,
+            pkgs=tuple(pkgs),
             prefix=prefix,
             origins=origins,
             process=self._create_process(),
@@ -485,7 +487,7 @@ class InstallerQueue(QObject):
         item = self._build_queue_item(
             tool=tool,
             action=InstallerActions.UNINSTALL,
-            pkgs=pkgs,
+            pkgs=tuple(pkgs),
             prefix=prefix,
             process=self._create_process(),
             **kwargs,
@@ -563,7 +565,7 @@ class InstallerQueue(QObject):
                 'exit_code': 1,
                 'exit_status': 0,
                 'action': InstallerActions.CANCEL_ALL,
-                'pkgs': all_pkgs,
+                'pkgs': tuple(all_pkgs),
             }
         )
         self._process_queue()

{napari_plugin_manager-0.1.7 → napari_plugin_manager-0.1.8rc0}/src/napari_plugin_manager/qt_plugin_dialog.py

@@ -190,7 +190,9 @@ class QtPluginDialog(BaseQtPluginDialog):
         self.setStyleSheet(stylesheet)
 
     def _add_installed(self, pkg_name: str | None = None) -> None:
-        use_npe2_adaptor = get_settings().plugins.use_npe2_adaptor
+        use_npe2_adaptor = getattr(
+            get_settings().plugins, 'use_npe2_adaptor', True
+        )
         pm2 = npe2.PluginManager.instance()
         pm2.discover(include_npe1=use_npe2_adaptor)
         for manifest in pm2.iter_manifests():
@@ -205,6 +207,7 @@ class QtPluginDialog(BaseQtPluginDialog):
                     distname, enabled, distname, plugin_api_version=npev
                 )
 
+        # for old napari versions that still have the setting
         if not use_npe2_adaptor:
             napari.plugins.plugin_manager.discover()  # since they might not be loaded yet
             for (
@@ -242,9 +245,6 @@ class QtPluginDialog(BaseQtPluginDialog):
                 break
 
     def _fetch_available_plugins(self, clear_cache: bool = False) -> None:
-        settings = get_settings()
-        use_npe2_adaptor = settings.plugins.use_npe2_adaptor
-
         if clear_cache:
             cache_clear()
 
@@ -256,6 +256,9 @@ class QtPluginDialog(BaseQtPluginDialog):
         self.worker.finished.connect(self.search)
         self.worker.start()
 
+        use_npe2_adaptor = getattr(
+            get_settings().plugins, 'use_npe2_adaptor', True
+        )
         pm2 = npe2.PluginManager.instance()
         pm2.discover(include_npe1=use_npe2_adaptor)
 

{napari_plugin_manager-0.1.7 → napari_plugin_manager-0.1.8rc0}/src/napari_plugin_manager.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: napari-plugin-manager
-Version: 0.1.7
+Version: 0.1.8rc0
 Summary: Install plugins for napari, in napari.
 Author-email: napari team <napari-steering-council@googlegroups.com>
 License-Expression: BSD-3-Clause
@@ -29,7 +29,6 @@ Classifier: Operating System :: MacOS
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: napari
 Requires-Dist: npe2
 Requires-Dist: qtpy
 Requires-Dist: superqt
@@ -45,7 +44,7 @@ Requires-Dist: napari-plugin-manager[uv]; extra == "testing"
 Requires-Dist: coverage; extra == "testing"
 Requires-Dist: flaky; extra == "testing"
 Requires-Dist: pytest; extra == "testing"
-Requires-Dist: pytest-qt<4.5; extra == "testing"
+Requires-Dist: pytest-qt; extra == "testing"
 Requires-Dist: virtualenv; extra == "testing"
 Provides-Extra: docs
 Requires-Dist: sphinx>6; extra == "docs"

{napari_plugin_manager-0.1.7 → napari_plugin_manager-0.1.8rc0}/src/napari_plugin_manager.egg-info/requires.txt

@@ -1,4 +1,3 @@
-napari
 npe2
 qtpy
 superqt
@@ -23,7 +22,7 @@ napari-plugin-manager[uv]
 coverage
 flaky
 pytest
-pytest-qt<4.5
+pytest-qt
 virtualenv
 
 [uv]

{napari_plugin_manager-0.1.7 → napari_plugin_manager-0.1.8rc0}/tox.ini

@@ -1,6 +1,6 @@
 # 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}-{PyQt5,PySide2,PySide6}-napari_{latest,repo}
+envlist = pip-py{310,311,312,313}-{PyQt5,PyQt6,PySide6}-napari_{latest,repo}, conda-{py310,py311,py312,py313}-{PyQt5,PySide6}-napari_{latest,repo}
 toxworkdir=/tmp/.tox
 isolated_build = true
 
@@ -48,10 +48,10 @@ deps =
     napari_latest: napari
     napari_repo: git+https://github.com/napari/napari.git
 
+
 # Conditional dependencies for CONDA
-[testenv:conda-{py310,py311,py312}-{PyQt5,PySide2,PySide6}-napari_{latest,repo}]
+[testenv:conda-{py310,py311,py312}-{PyQt5,PySide6}-napari_{latest,repo}]
 conda_deps =
     {py310,py311,py312}-PyQt5: pyqt
-    {py310,py311}-PySide2: pyside2
     PySide6: pyside6 > 6.7
     napari_latest: napari