Merge branch 'main' into pre-commit-ci-update-config

napari · May 28, 2024 · d798a7f · d798a7f
2 parents 852c4c3 + 27d9c09
commit d798a7f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml
@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest, windows-latest, macos-latest]
+        platform: [ubuntu-latest, windows-latest, macos-13]
         python-version: ["3.9", "3.10", "3.11"]
         napari: ["latest", "repo"]
         exclude:

diff --git a/napari_plugin_manager/_tests/test_qt_plugin_dialog.py b/napari_plugin_manager/_tests/test_qt_plugin_dialog.py
@@ -1,4 +1,5 @@
 import importlib.metadata
+import platform
 import sys
 from typing import Generator, Optional, Tuple
 from unittest.mock import patch
@@ -10,16 +11,18 @@
 from napari.plugins._tests.test_npe2 import mock_pm  # noqa
 from napari.utils.translations import trans
 
-from napari_plugin_manager import qt_plugin_dialog
-from napari_plugin_manager.qt_package_installer import InstallerActions
-
-if qtpy.API_NAME == 'PySide2' and sys.version_info[:2] == (3, 11):
+if (qtpy.API_NAME == 'PySide2' and platform.system() != "Linux") or (
+    sys.version_info[:2] > (3, 10) and platform.system() == "Linux"
+):
     pytest.skip(
-        "Known PySide2 x Python 3.11 incompatibility: "
-        "TypeError: 'PySide2.QtCore.Qt.Alignment' object cannot be interpreted as an integer",
+        "Known PySide2 x Python incompatibility: "
+        "... object cannot be interpreted as an integer",
         allow_module_level=True,
     )
 
+from napari_plugin_manager import qt_plugin_dialog
+from napari_plugin_manager.qt_package_installer import InstallerActions
+
 N_MOCKED_PLUGINS = 2