Merge branch 'main' into issue_110_warning_opt

napari · Nov 27, 2024 · 807e313 · 807e313
2 parents a9f6f81 + cccd4d1
commit 807e313
Show file tree

Hide file tree

Showing 4 changed files with 1,903 additions and 1,436 deletions.
diff --git a/napari_plugin_manager/_tests/test_qt_plugin_dialog.py b/napari_plugin_manager/_tests/test_qt_plugin_dialog.py
@@ -188,10 +188,6 @@ def set_blocked(self, plugin, blocked):
     monkeypatch.setattr(
         qt_plugin_dialog, "running_as_constructor_app", lambda: request.param
     )
-    monkeypatch.setattr(
-        qt_plugin_dialog, "IS_NAPARI_CONDA_INSTALLED", request.param
-    )
-    monkeypatch.setattr(qt_plugin_dialog, "ON_BUNDLE", request.param)
     monkeypatch.setattr(
         napari.plugins, 'plugin_manager', OldPluginManagerMock()
     )
@@ -201,6 +197,9 @@ def set_blocked(self, plugin, blocked):
     monkeypatch.setattr(npe2, 'PluginManager', PluginManagerMock())
 
     widget = qt_plugin_dialog.QtPluginDialog()
+    monkeypatch.setattr(
+        widget, '_is_main_app_conda_package', lambda: request.param
+    )
     # monkeypatch.setattr(widget, '_tag_outdated_plugins', lambda: None)
     widget.show()
     qtbot.waitUntil(widget.isVisible, timeout=300)