From b4333b6d1b4823a237ee91521f95358d8fee5dd7 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Sat, 21 Oct 2017 14:30:22 +0200
Subject: [PATCH 1/3] Implement #250

---
 pyblish/logic.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pyblish/logic.py b/pyblish/logic.py
index c00f6c94..d5109212 100644
--- a/pyblish/logic.py
+++ b/pyblish/logic.py
@@ -381,4 +381,12 @@ def Iterator(plugins, context, state=None):
                 yield plugin, instance
 
         else:
+        
+            # When filtering to families at least a single instance with
+            # that family must be active in the current publish
+            if "*" not in plugin.families:
+                if not any(instance.data.get("publish") is not False 
+                           for instance in instances):
+                    continue
+                    
             yield plugin, None

From 55a96202f80fd5b05ffd49dec0cb7582c16dcb57 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 21 Mar 2018 14:27:12 +0100
Subject: [PATCH 2/3] Add toggle for backwards compatibility on ContextPlugin
 to run on family

---
 pyblish/logic.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/pyblish/logic.py b/pyblish/logic.py
index d5109212..130486b9 100644
--- a/pyblish/logic.py
+++ b/pyblish/logic.py
@@ -348,6 +348,12 @@ def Iterator(plugins, context, state=None):
 
     """
 
+    # Run ContextPlugin only if instance of family is present when not "*"
+    # This is to preserve backwards compatility.
+    PYBLISH_CONTEXTPLUGIN_ON_FAMILY = bool(
+        os.getenv("PYBLISH_CONTEXTPLUGIN_ON_FAMILY")
+    )
+
     test = registered_test()
     state = state or {
         "nextOrder": None,
@@ -381,12 +387,13 @@ def Iterator(plugins, context, state=None):
                 yield plugin, instance
 
         else:
-        
-            # When filtering to families at least a single instance with
-            # that family must be active in the current publish
-            if "*" not in plugin.families:
-                if not any(instance.data.get("publish") is not False 
-                           for instance in instances):
-                    continue
-                    
+
+            if PYBLISH_CONTEXTPLUGIN_ON_FAMILY:
+                # When filtering to families at least a single instance with
+                # that family must be active in the current publish
+                if "*" not in plugin.families:
+                    if not any(instance.data.get("publish") is not False
+                               for instance in instances):
+                        continue
+
             yield plugin, None

From 847ac829791f621edf962253fc59448d660f2f30 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 21 Mar 2018 15:09:46 +0100
Subject: [PATCH 3/3] Add test for PYBLISH_CONTEXTPLUGIN_ON_FAMILY
 functionality

---
 tests/lib.py        | 15 ++++++++++++
 tests/test_logic.py | 60 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+)

diff --git a/tests/lib.py b/tests/lib.py
index 795a04be..385d794f 100644
--- a/tests/lib.py
+++ b/tests/lib.py
@@ -76,3 +76,18 @@ def tempdir():
         yield tempdir
     finally:
         shutil.rmtree(tempdir)
+
+
+@contextlib.contextmanager
+def env_override(overrides):
+    """Temporarily override environment variables"""
+    assert isinstance(overrides, dict)
+    original = os.environ.copy()
+    os.environ.update(overrides)
+
+    try:
+        yield
+    finally:
+        # Reset
+        os.environ.clear()
+        os.environ.update(original)
diff --git a/tests/test_logic.py b/tests/test_logic.py
index 710977cb..6b61abf7 100644
--- a/tests/test_logic.py
+++ b/tests/test_logic.py
@@ -67,6 +67,66 @@ def process(self, instance):
     assert count["#"] == 101, count
 
 
+@with_setup(lib.setup, lib.teardown)
+def test_contextplugin_on_family_iterator():
+    """Iterator skips ContextPlugin filtered to family
+
+    This functionality is only enabled when PYBLISH_CONTEXTPLUGIN_ON_FAMILY
+    environment variable is set to a True value to preserve backwards
+    compatibility.
+
+    """
+
+    count = {"#": 0}
+
+    class MyCollector(api.ContextPlugin):
+        order = api.CollectorOrder
+
+        def process(self, context):
+            instance = context.create_instance("A1")
+            instance.data['families'] = ["A"]
+            instance = context.create_instance("A2")
+            instance.data['families'] = ["A"]
+            instance = context.create_instance("C1")
+            instance.data['families'] = ["C"]
+
+            count["#"] += 1
+
+    class ValidateA(api.ContextPlugin):
+        families = ["A"]
+        order = api.CollectorOrder
+
+        def process(self, context):
+            count["#"] += 10
+
+    class ValidateB(api.ContextPlugin):
+        families = ["B"]
+        order = api.CollectorOrder
+
+        def process(self, context):
+            count["#"] += 100
+
+    class ValidateAC(api.ContextPlugin):
+        families = ["A", "C"]
+        order = api.CollectorOrder
+
+        def process(self, context):
+            count["#"] += 1000
+
+    context = api.Context()
+    plugins = [MyCollector, ValidateA, ValidateB, ValidateAC]
+
+    assert count["#"] == 0, count
+
+    with lib.env_override({"PYBLISH_CONTEXTPLUGIN_ON_FAMILY": "True"}):
+        for Plugin, instance in logic.Iterator(plugins, context):
+            assert Plugin.__name__ != "ValidateB"
+            plugin.process(Plugin, context, instance)
+
+    # Collector runs once, one Validator runs once
+    assert count["#"] == 1011, count
+
+
 def test_register_gui():
     """Registering at run-time takes precedence over those from environment"""