napari-plugin-manager 0.1.8__py3-none-any.whl → 0.1.9__py3-none-any.whl

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/_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/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.8'
-__version_tuple__ = version_tuple = (0, 1, 8)
+__version__ = version = '0.1.9'
+__version_tuple__ = version_tuple = (0, 1, 9)
 
 __commit_id__ = commit_id = None

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/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.8.dist-info → napari_plugin_manager-0.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: napari-plugin-manager
-Version: 0.1.8
+Version: 0.1.9
 Summary: Install plugins for napari, in napari.
 Author-email: napari team <napari-steering-council@googlegroups.com>
 License-Expression: BSD-3-Clause
@@ -44,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.8.dist-info → napari_plugin_manager-0.1.9.dist-info}/RECORD

@@ -1,10 +1,10 @@
 napari_plugin_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-napari_plugin_manager/_version.py,sha256=Zaz3s9gl_rzsS46-ymJOALojMxviW77EJq_agE8knLk,704
-napari_plugin_manager/base_qt_package_installer.py,sha256=rWsD1BvJL3RG9pBEJEaUH5ugGzg4sVgQVg0RHKnP6us,24487
+napari_plugin_manager/_version.py,sha256=ib8ckvf-NNDfacXd8unW0p5cf-gl57XyQvjoEMc_pvc,704
+napari_plugin_manager/base_qt_package_installer.py,sha256=O5WgL23H9Y2ozVsdZ1eBf0nnmb8QtP7DVVXav2KSEtY,24551
 napari_plugin_manager/base_qt_plugin_dialog.py,sha256=0NDzTN7Bxek5mr4DZDPJVddh1eDjIwZtUxeKFSCQToA,67432
 napari_plugin_manager/npe2api.py,sha256=gAPOC-g0GWAwN71m0GimM0SW6YHI39XxSJm_qhq3-OY,4352
 napari_plugin_manager/qt_package_installer.py,sha256=QFQDED3MKbQupKF7OjBPz70cK2zrgIP2gu4vdUVV8Tk,3511
-napari_plugin_manager/qt_plugin_dialog.py,sha256=8GcaQuSWF5jZHcdn6j2Ye6liJ5yRDjtnuqenpVSyfkM,10208
+napari_plugin_manager/qt_plugin_dialog.py,sha256=seaKKoeFsPK7L2z4fj6-UGuNYBqZ1I-U54AcZ0uu9Ok,10321
 napari_plugin_manager/qt_warning_dialog.py,sha256=DtPoFBn7zDfSmkdMokm1BcuoYasngkC0jwJok-oIuGk,727
 napari_plugin_manager/qt_widgets.py,sha256=OatVQPuJFP5sgYRq_KiaynwXI3UfLGiTwBRlFy-b5mk,399
 napari_plugin_manager/styles.qss,sha256=2oJBNiLT3YtqQP3avQGAOWcSSOZiFHGDsHtI5TjjxuA,7928
@@ -12,12 +12,12 @@ napari_plugin_manager/utils.py,sha256=vGvOndyiwc_JaSHVtXIc9z-dGsewo_vRb31U-26vy2
 napari_plugin_manager/_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 napari_plugin_manager/_tests/conftest.py,sha256=Bm8u6hT5-mQXaxamke79tJGrU8BZA3V444YBLPivVr8,1885
 napari_plugin_manager/_tests/test_base_installer_process.py,sha256=Cv-nBnUeNAX6pYUE1zs38I9vGtCE-ahBN4q-xcBH-pw,561
-napari_plugin_manager/_tests/test_installer_process.py,sha256=CshbV0OGzmL0kus9_0AvrEOU_vleMdSmPPo0RbCizMw,12760
+napari_plugin_manager/_tests/test_installer_process.py,sha256=0kyPzUcx1-yVc21B0HQkf4TCLnkDWBDtaJU-UXSVk1s,12821
 napari_plugin_manager/_tests/test_npe2api.py,sha256=ncBGWHrA5uZjmt6w4lVlx8D-n_3At1bfAZgkMRxK7Lg,1275
-napari_plugin_manager/_tests/test_qt_plugin_dialog.py,sha256=4zGIfLomCCC-rTebkf6ggXd8Tedx6mi7GtmRv6IKTj4,21670
+napari_plugin_manager/_tests/test_qt_plugin_dialog.py,sha256=Rcfaho94vM7iwumU4n6ygyP5O3E7lsXIpoAwpXmI2YA,20702
 napari_plugin_manager/_tests/test_utils.py,sha256=rAlqp8y1MR3U4nWCN1jekbvP_avket3fVgEQwJDqpKk,1674
-napari_plugin_manager-0.1.8.dist-info/licenses/LICENSE,sha256=8dAlKbOqTMYe9L-gL_kEx5Xr1Sd0AbaWQDUkpiOp3vI,1506
-napari_plugin_manager-0.1.8.dist-info/METADATA,sha256=tlRDPoC294ZIMKgzCzHVtW2sy4CtgbVs_waCIOlz2dk,12159
-napari_plugin_manager-0.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-napari_plugin_manager-0.1.8.dist-info/top_level.txt,sha256=pmCqLetuumhY1CKSuTZ5eQsitzazrSvc7V_mkugEPTY,22
-napari_plugin_manager-0.1.8.dist-info/RECORD,,
+napari_plugin_manager-0.1.9.dist-info/licenses/LICENSE,sha256=8dAlKbOqTMYe9L-gL_kEx5Xr1Sd0AbaWQDUkpiOp3vI,1506
+napari_plugin_manager-0.1.9.dist-info/METADATA,sha256=tsF-_gWnA_owBaG2wpfBptVqbZCtoSUyV9_nXiL9xMs,12155
+napari_plugin_manager-0.1.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+napari_plugin_manager-0.1.9.dist-info/top_level.txt,sha256=pmCqLetuumhY1CKSuTZ5eQsitzazrSvc7V_mkugEPTY,22
+napari_plugin_manager-0.1.9.dist-info/RECORD,,