Merge branch 'master' of https://github.com/napari/napari-plugin-engine

napari · Sep 17, 2021 · 79ee20f · 79ee20f
2 parents eeb246c + b42955b
commit 79ee20f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/napari_plugin_engine/manager.py b/napari_plugin_engine/manager.py
@@ -267,7 +267,10 @@ def discover(
                     self._id_counts[old_name] += 1
             except PluginError as e:
                 errs.append(e)
-                self.set_blocked(name)
+                # commenting out for now, because napari stores this blockage
+                # too permanently, and it's hard to differentiate between
+                # plugins intentionally blocked by the user.
+                # self.set_blocked(name)
                 if ignore_errors:
                     continue
                 raise e

diff --git a/testing/test_discovery.py b/testing/test_discovery.py
@@ -270,7 +270,7 @@ def test_specification(arg1, arg2):
     assert errs
     assert isinstance(errs[0], PluginValidationError)
     # and it should now be blocked
-    assert test_plugin_manager.is_blocked('app_invalid_plugin')
+    # assert test_plugin_manager.is_blocked('app_invalid_plugin')
 
     # if we unblock the plugin and turn off ignore_errors
     # we'll get a registration error at discovery
@@ -328,7 +328,7 @@ def test_specification(arg1, arg2):
     assert errs
     assert isinstance(errs[0], PluginValidationError)
     # and it should now be blocked
-    assert test_plugin_manager.is_blocked('invalid')
+    # assert test_plugin_manager.is_blocked('invalid')
 
     # if we unblock the plugin and turn off ignore_errors
     # we'll get a registration error at discovery