Skip to content

Commit dbcd362

Browse files
authored
Remove PySide2 skip conditions and fix PySide2 signal emit calls failures (#107)
* Remove PySide2 skip conditions hiding pending issues to address related with Signal handling on PySide2 * Use 'object' instead of 'StringEnum' to define 'actionRequested' signal
1 parent a764714 commit dbcd362

File tree

2 files changed

+1
-39
lines changed

2 files changed

+1
-39
lines changed

napari_plugin_manager/_tests/test_qt_plugin_dialog.py

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import importlib.metadata
22
import os
3-
import platform
43
import sys
54
from typing import Generator, Optional, Tuple
65
from unittest.mock import patch
@@ -406,12 +405,6 @@ def test_add_items_outdated_and_update(plugin_dialog, qtbot):
406405
assert widget.version.toolTip() == updated_version
407406

408407

409-
@pytest.mark.skipif(
410-
qtpy.API_NAME.lower().startswith('pyside')
411-
and sys.version_info[:2] > (3, 10)
412-
and platform.system() == "Darwin",
413-
reason='pyside specific bug',
414-
)
415408
def test_refresh(qtbot, plugin_dialog):
416409
with qtbot.waitSignal(plugin_dialog._add_items_timer.timeout, timeout=500):
417410
plugin_dialog.refresh(clear_cache=False)
@@ -423,35 +416,17 @@ def test_refresh(qtbot, plugin_dialog):
423416
plugin_dialog._refresh_and_clear_cache()
424417

425418

426-
@pytest.mark.skipif(
427-
qtpy.API_NAME.lower().startswith('pyside')
428-
and sys.version_info[:2] > (3, 10)
429-
and platform.system() == "Darwin",
430-
reason='pyside specific bug',
431-
)
432419
def test_toggle_status(plugin_dialog):
433420
plugin_dialog.toggle_status(True)
434421
assert plugin_dialog.stdout_text.isVisible()
435422
plugin_dialog.toggle_status(False)
436423
assert not plugin_dialog.stdout_text.isVisible()
437424

438425

439-
@pytest.mark.skipif(
440-
qtpy.API_NAME.lower().startswith('pyside')
441-
and sys.version_info[:2] > (3, 10)
442-
and platform.system() == "Darwin",
443-
reason='pyside specific bug',
444-
)
445426
def test_exec(plugin_dialog):
446427
plugin_dialog.exec_()
447428

448429

449-
@pytest.mark.skipif(
450-
qtpy.API_NAME.lower().startswith('pyside')
451-
and sys.version_info[:2] > (3, 10)
452-
and platform.system() == "Darwin",
453-
reason='pyside specific bug',
454-
)
455430
def test_search_in_available(plugin_dialog):
456431
idxs = plugin_dialog._search_in_available("test")
457432
assert idxs == [0, 1, 2, 3]
@@ -474,9 +449,6 @@ def test_drop_event(plugin_dialog, tmp_path):
474449
assert plugin_dialog.direct_entry_edit.text() == str(path_1)
475450

476451

477-
@pytest.mark.skipif(
478-
qtpy.API_NAME.lower().startswith('pyside'), reason='pyside specific bug'
479-
)
480452
def test_installs(qtbot, tmp_virtualenv, plugin_dialog, request):
481453
if "[constructor]" in request.node.name:
482454
pytest.skip(
@@ -497,9 +469,6 @@ def test_installs(qtbot, tmp_virtualenv, plugin_dialog, request):
497469
qtbot.wait(5000)
498470

499471

500-
@pytest.mark.skipif(
501-
qtpy.API_NAME.lower().startswith('pyside'), reason='pyside specific bug'
502-
)
503472
def test_cancel(qtbot, tmp_virtualenv, plugin_dialog, request):
504473
if "[constructor]" in request.node.name:
505474
pytest.skip(
@@ -522,9 +491,6 @@ def test_cancel(qtbot, tmp_virtualenv, plugin_dialog, request):
522491
assert plugin_dialog.installed_list.count() == 2
523492

524493

525-
@pytest.mark.skipif(
526-
qtpy.API_NAME.lower().startswith('pyside'), reason='pyside specific bug'
527-
)
528494
def test_cancel_all(qtbot, tmp_virtualenv, plugin_dialog, request):
529495
if "[constructor]" in request.node.name:
530496
pytest.skip(
@@ -545,9 +511,6 @@ def test_cancel_all(qtbot, tmp_virtualenv, plugin_dialog, request):
545511
assert plugin_dialog.installed_list.count() == 2
546512

547513

548-
@pytest.mark.skipif(
549-
qtpy.API_NAME.lower().startswith('pyside'), reason='pyside specific bug'
550-
)
551514
def test_direct_entry_installs(qtbot, tmp_virtualenv, plugin_dialog, request):
552515
if "[constructor]" in request.node.name:
553516
pytest.skip(

napari_plugin_manager/qt_plugin_dialog.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
from napari.plugins.utils import normalized_name
1818
from napari.settings import get_settings
1919
from napari.utils.misc import (
20-
StringEnum,
2120
parse_version,
2221
running_as_constructor_app,
2322
)
@@ -105,7 +104,7 @@ class PluginListItem(QFrame):
105104
author, source, version, and buttons to update, install/uninstall, etc."""
106105

107106
# item, package_name, action_name, version, installer_choice
108-
actionRequested = Signal(QListWidgetItem, str, StringEnum, str, StringEnum)
107+
actionRequested = Signal(QListWidgetItem, str, object, str, object)
109108

110109
def __init__(
111110
self,

0 commit comments

Comments
 (0)