fix: resolve conflicts with main branch

- Update import pattern for NOTSET and ArgNotSet to support both Airflow versions
- Fix parametrize decorators to use tuples instead of strings (PT006 rule)

Author: hwang-cadent

providers/standard/src/airflow/providers/standard/operators/trigger_dagrun.py

@@ -42,7 +42,12 @@
 from airflow.providers.standard.triggers.external_task import DagStateTrigger
 from airflow.providers.standard.version_compat import AIRFLOW_V_3_0_PLUS, BaseOperator
 from airflow.utils.state import DagRunState
-from airflow.utils.types import NOTSET, ArgNotSet, DagRunType
+from airflow.utils.types import DagRunType
+
+try:
+    from airflow.sdk.definitions._internal.types import NOTSET, ArgNotSet
+except ImportError:
+    from airflow.utils.types import NOTSET, ArgNotSet  # type: ignore[attr-defined,no-redef]
 
 XCOM_LOGICAL_DATE_ISO = "trigger_logical_date_iso"
 XCOM_RUN_ID = "trigger_run_id"

providers/standard/tests/unit/standard/operators/test_trigger_dagrun.py

@@ -624,7 +624,7 @@ def test_trigger_dagrun_with_reset_dag_run_false(self, dag_maker):
             assert len(dagruns) == 2
 
     @pytest.mark.parametrize(
-        "trigger_run_id, trigger_logical_date",
+        ("trigger_run_id", "trigger_logical_date"),
         [
             (None, DEFAULT_DATE),
             ("dummy_run_id", None),
@@ -674,7 +674,7 @@ def test_trigger_dagrun_with_skip_when_already_exists(self, dag_maker):
         assert dr.get_task_instance("test_task").state == TaskInstanceState.SKIPPED
 
     @pytest.mark.parametrize(
-        "trigger_run_id, trigger_logical_date, expected_dagruns_count",
+        ("trigger_run_id", "trigger_logical_date", "expected_dagruns_count"),
         [
             (None, DEFAULT_DATE, 1),
             (None, None, 2),