refactor(trigger_rule): remove deprecated NONE_FAILED_OR_SKIPPED

airflow/utils/trigger_rule.py

@@ -31,7 +31,6 @@ class TriggerRule(str, Enum):
     ONE_FAILED = "one_failed"
     ONE_DONE = "one_done"
     NONE_FAILED = "none_failed"
-    NONE_FAILED_OR_SKIPPED = "none_failed_or_skipped"
     NONE_SKIPPED = "none_skipped"
     ALWAYS = "always"
     NONE_FAILED_MIN_ONE_SUCCESS = "none_failed_min_one_success"

newsfragments/44475.significant.rst

@@ -0,0 +1,21 @@
+Remove ``TriggerRule.NONE_FAILED_OR_SKIPPED``
+
+.. Provide additional contextual information
+
+.. Check the type of change that applies to this change
+
+* Types of change
+
+  * [x] DAG changes
+  * [ ] Config changes
+  * [ ] API changes
+  * [ ] CLI changes
+  * [ ] Behaviour changes
+  * [ ] Plugin changes
+  * [ ] Dependency change
+
+.. List the migration rules needed for this change (see https://github.com/apache/airflow/issues/41641)
+
+* Migrations rules needed
+
+  * Remove attribute ``TriggerRule.NONE_FAILED_OR_SKIPPED``

tests/utils/test_trigger_rule.py

@@ -32,12 +32,11 @@ def test_valid_trigger_rules(self):
         assert TriggerRule.is_valid(TriggerRule.ONE_FAILED)
         assert TriggerRule.is_valid(TriggerRule.ONE_DONE)
         assert TriggerRule.is_valid(TriggerRule.NONE_FAILED)
-        assert TriggerRule.is_valid(TriggerRule.NONE_FAILED_OR_SKIPPED)
         assert TriggerRule.is_valid(TriggerRule.NONE_SKIPPED)
         assert TriggerRule.is_valid(TriggerRule.ALWAYS)
         assert TriggerRule.is_valid(TriggerRule.NONE_FAILED_MIN_ONE_SUCCESS)
         assert TriggerRule.is_valid(TriggerRule.ALL_DONE_SETUP_SUCCESS)
-        assert len(TriggerRule.all_triggers()) == 13
+        assert len(TriggerRule.all_triggers()) == 12
 
         with pytest.raises(ValueError):
             TriggerRule("NOT_EXIST_TRIGGER_RULE")