Use airflow.models.dag.DAG in examples (apache#34617)

asapekia · Sep 26, 2023 · 4df5b57 · 4df5b57
1 parent 05ce0d1
commit 4df5b57
Show file tree

Hide file tree

Showing 32 changed files with 34 additions and 33 deletions.
diff --git a/airflow/example_dags/example_bash_operator.py b/airflow/example_dags/example_bash_operator.py
@@ -22,7 +22,7 @@
 
 import pendulum
 
-from airflow import DAG
+from airflow.models.dag import DAG
 from airflow.operators.bash import BashOperator
 from airflow.operators.empty import EmptyOperator
 

diff --git a/airflow/example_dags/example_branch_datetime_operator.py b/airflow/example_dags/example_branch_datetime_operator.py
@@ -23,7 +23,7 @@
 
 import pendulum
 
-from airflow import DAG
+from airflow.models.dag import DAG
 from airflow.operators.datetime import BranchDateTimeOperator
 from airflow.operators.empty import EmptyOperator
 

diff --git a/airflow/example_dags/example_branch_day_of_week_operator.py b/airflow/example_dags/example_branch_day_of_week_operator.py
@@ -22,7 +22,7 @@
 
 import pendulum
 
-from airflow import DAG
+from airflow.models.dag import DAG
 from airflow.operators.empty import EmptyOperator
 from airflow.operators.weekday import BranchDayOfWeekOperator
 from airflow.utils.weekday import WeekDay

diff --git a/airflow/example_dags/example_branch_labels.py b/airflow/example_dags/example_branch_labels.py
@@ -22,7 +22,7 @@
 
 import pendulum
 
-from airflow import DAG
+from airflow.models.dag import DAG
 from airflow.operators.empty import EmptyOperator
 from airflow.utils.edgemodifier import Label
 

diff --git a/airflow/example_dags/example_branch_operator.py b/airflow/example_dags/example_branch_operator.py
@@ -22,7 +22,7 @@
 
 import pendulum
 
-from airflow import DAG
+from airflow.models.dag import DAG
 from airflow.operators.empty import EmptyOperator
 from airflow.operators.python import BranchPythonOperator
 from airflow.utils.edgemodifier import Label

diff --git a/airflow/example_dags/example_branch_operator_decorator.py b/airflow/example_dags/example_branch_operator_decorator.py
@@ -22,8 +22,8 @@
 
 import pendulum
 
-from airflow import DAG
 from airflow.decorators import task
+from airflow.models.dag import DAG
 from airflow.operators.empty import EmptyOperator
 from airflow.utils.edgemodifier import Label
 from airflow.utils.trigger_rule import TriggerRule

diff --git a/airflow/example_dags/example_branch_python_dop_operator_3.py b/airflow/example_dags/example_branch_python_dop_operator_3.py
@@ -23,8 +23,8 @@
 
 import pendulum
 
-from airflow import DAG
 from airflow.decorators import task
+from airflow.models.dag import DAG
 from airflow.operators.empty import EmptyOperator
 
 

diff --git a/airflow/example_dags/example_complex.py b/airflow/example_dags/example_complex.py
@@ -22,11 +22,11 @@
 
 import pendulum
 
-from airflow import models
 from airflow.models.baseoperator import chain
+from airflow.models.dag import DAG
 from airflow.operators.bash import BashOperator
 
-with models.DAG(
+with DAG(
     dag_id="example_complex",
     schedule=None,
     start_date=pendulum.datetime(2021, 1, 1, tz="UTC"),

diff --git a/airflow/example_dags/example_dynamic_task_mapping.py b/airflow/example_dags/example_dynamic_task_mapping.py
@@ -20,8 +20,8 @@
 
 from datetime import datetime
 
-from airflow import DAG
 from airflow.decorators import task
+from airflow.models.dag import DAG
 
 with DAG(dag_id="example_dynamic_task_mapping", start_date=datetime(2022, 3, 4)) as dag:
 

diff --git a/airflow/example_dags/example_dynamic_task_mapping_with_no_taskflow_operators.py b/airflow/example_dags/example_dynamic_task_mapping_with_no_taskflow_operators.py
@@ -20,8 +20,8 @@
 
 from datetime import datetime
 
-from airflow import DAG
 from airflow.models.baseoperator import BaseOperator
+from airflow.models.dag import DAG
 
 
 class AddOneOperator(BaseOperator):

diff --git a/airflow/example_dags/example_external_task_marker_dag.py b/airflow/example_dags/example_external_task_marker_dag.py
@@ -41,7 +41,7 @@
 
 import pendulum
 
-from airflow import DAG
+from airflow.models.dag import DAG
 from airflow.operators.empty import EmptyOperator
 from airflow.sensors.external_task import ExternalTaskMarker, ExternalTaskSensor
 

diff --git a/airflow/example_dags/example_kubernetes_executor.py b/airflow/example_dags/example_kubernetes_executor.py
@@ -25,10 +25,10 @@
 
 import pendulum
 
-from airflow import DAG
 from airflow.configuration import conf
 from airflow.decorators import task
 from airflow.example_dags.libs.helper import print_stuff
+from airflow.models.dag import DAG
 
 log = logging.getLogger(__name__)
 

diff --git a/airflow/example_dags/example_latest_only.py b/airflow/example_dags/example_latest_only.py
@@ -20,7 +20,7 @@
 
 import datetime
 
-from airflow import DAG
+from airflow.models.dag import DAG
 from airflow.operators.empty import EmptyOperator
 from airflow.operators.latest_only import LatestOnlyOperator
 

diff --git a/airflow/example_dags/example_latest_only_with_trigger.py b/airflow/example_dags/example_latest_only_with_trigger.py
@@ -25,7 +25,7 @@
 
 import pendulum
 
-from airflow import DAG
+from airflow.models.dag import DAG
 from airflow.operators.empty import EmptyOperator
 from airflow.operators.latest_only import LatestOnlyOperator
 from airflow.utils.trigger_rule import TriggerRule

diff --git a/airflow/example_dags/example_local_kubernetes_executor.py b/airflow/example_dags/example_local_kubernetes_executor.py
@@ -23,10 +23,10 @@
 import logging
 from datetime import datetime
 
-from airflow import DAG
 from airflow.configuration import conf
 from airflow.decorators import task
 from airflow.example_dags.libs.helper import print_stuff
+from airflow.models.dag import DAG
 
 log = logging.getLogger(__name__)
 

diff --git a/airflow/example_dags/example_nested_branch_dag.py b/airflow/example_dags/example_nested_branch_dag.py
@@ -25,7 +25,7 @@
 import pendulum
 
 from airflow.decorators import task
-from airflow.models import DAG
+from airflow.models.dag import DAG
 from airflow.operators.empty import EmptyOperator
 from airflow.utils.trigger_rule import TriggerRule
 

diff --git a/airflow/example_dags/example_params_trigger_ui.py b/airflow/example_dags/example_params_trigger_ui.py
@@ -25,8 +25,8 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from airflow import DAG
 from airflow.decorators import task
+from airflow.models.dag import DAG
 from airflow.models.param import Param
 from airflow.utils.trigger_rule import TriggerRule
 

diff --git a/airflow/example_dags/example_params_ui_tutorial.py b/airflow/example_dags/example_params_ui_tutorial.py
@@ -27,9 +27,9 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from airflow import DAG
 from airflow.decorators import task
 from airflow.exceptions import AirflowSkipException
+from airflow.models.dag import DAG
 from airflow.models.param import Param
 
 if TYPE_CHECKING:

diff --git a/airflow/example_dags/example_passing_params_via_test_command.py b/airflow/example_dags/example_passing_params_via_test_command.py
@@ -24,8 +24,8 @@
 
 import pendulum
 
-from airflow import DAG
 from airflow.decorators import task
+from airflow.models.dag import DAG
 from airflow.operators.bash import BashOperator
 
 

diff --git a/airflow/example_dags/example_python_operator.py b/airflow/example_dags/example_python_operator.py
@@ -29,8 +29,8 @@
 
 import pendulum
 
-from airflow import DAG
 from airflow.decorators import task
+from airflow.models.dag import DAG
 from airflow.operators.python import ExternalPythonOperator, PythonVirtualenvOperator, is_venv_installed
 
 log = logging.getLogger(__name__)

diff --git a/airflow/example_dags/example_sensors.py b/airflow/example_dags/example_sensors.py
@@ -21,7 +21,7 @@
 
 import pendulum
 
-from airflow.models import DAG
+from airflow.models.dag import DAG
 from airflow.operators.bash import BashOperator
 from airflow.sensors.bash import BashSensor
 from airflow.sensors.filesystem import FileSensor

diff --git a/airflow/example_dags/example_short_circuit_operator.py b/airflow/example_dags/example_short_circuit_operator.py
@@ -20,8 +20,8 @@
 
 import pendulum
 
-from airflow import DAG
 from airflow.models.baseoperator import chain
+from airflow.models.dag import DAG
 from airflow.operators.empty import EmptyOperator
 from airflow.operators.python import ShortCircuitOperator
 from airflow.utils.trigger_rule import TriggerRule

diff --git a/airflow/example_dags/example_skip_dag.py b/airflow/example_dags/example_skip_dag.py
@@ -22,9 +22,9 @@
 
 import pendulum
 
-from airflow import DAG
 from airflow.exceptions import AirflowSkipException
 from airflow.models.baseoperator import BaseOperator
+from airflow.models.dag import DAG
 from airflow.operators.empty import EmptyOperator
 from airflow.utils.trigger_rule import TriggerRule
 

diff --git a/airflow/example_dags/example_subdag_operator.py b/airflow/example_dags/example_subdag_operator.py
@@ -21,8 +21,8 @@
 # [START example_subdag_operator]
 import datetime
 
-from airflow import DAG
 from airflow.example_dags.subdags.subdag import subdag
+from airflow.models.dag import DAG
 from airflow.operators.empty import EmptyOperator
 from airflow.operators.subdag import SubDagOperator
 

diff --git a/airflow/example_dags/example_time_delta_sensor_async.py b/airflow/example_dags/example_time_delta_sensor_async.py
@@ -25,7 +25,7 @@
 
 import pendulum
 
-from airflow import DAG
+from airflow.models.dag import DAG
 from airflow.operators.empty import EmptyOperator
 from airflow.sensors.time_delta import TimeDeltaSensorAsync
 

diff --git a/airflow/example_dags/example_trigger_controller_dag.py b/airflow/example_dags/example_trigger_controller_dag.py
@@ -24,7 +24,7 @@
 
 import pendulum
 
-from airflow import DAG
+from airflow.models.dag import DAG
 from airflow.operators.trigger_dagrun import TriggerDagRunOperator
 
 with DAG(

diff --git a/airflow/example_dags/example_trigger_target_dag.py b/airflow/example_dags/example_trigger_target_dag.py
@@ -24,8 +24,8 @@
 
 import pendulum
 
-from airflow import DAG
 from airflow.decorators import task
+from airflow.models.dag import DAG
 from airflow.operators.bash import BashOperator
 
 

diff --git a/airflow/example_dags/example_xcom.py b/airflow/example_dags/example_xcom.py
@@ -20,8 +20,9 @@
 
 import pendulum
 
-from airflow import DAG, XComArg
 from airflow.decorators import task
+from airflow.models.dag import DAG
+from airflow.models.xcom_arg import XComArg
 from airflow.operators.bash import BashOperator
 
 value_1 = [1, 2, 3]

diff --git a/airflow/example_dags/example_xcomargs.py b/airflow/example_dags/example_xcomargs.py
@@ -22,8 +22,8 @@
 
 import pendulum
 
-from airflow import DAG
 from airflow.decorators import task
+from airflow.models.dag import DAG
 from airflow.operators.bash import BashOperator
 
 log = logging.getLogger(__name__)

diff --git a/airflow/example_dags/subdags/subdag.py b/airflow/example_dags/subdags/subdag.py
@@ -21,7 +21,7 @@
 # [START subdag]
 import pendulum
 
-from airflow import DAG
+from airflow.models.dag import DAG
 from airflow.operators.empty import EmptyOperator
 
 

diff --git a/airflow/example_dags/tutorial.py b/airflow/example_dags/tutorial.py
@@ -28,7 +28,7 @@
 from datetime import datetime, timedelta
 
 # The DAG object; we'll need this to instantiate a DAG
-from airflow import DAG
+from airflow.models.dag import DAG
 
 # Operators; we need this to operate!
 from airflow.operators.bash import BashOperator

diff --git a/airflow/example_dags/tutorial_dag.py b/airflow/example_dags/tutorial_dag.py
@@ -29,7 +29,7 @@
 import pendulum
 
 # The DAG object; we'll need this to instantiate a DAG
-from airflow import DAG
+from airflow.models.dag import DAG
 
 # Operators; we need this to operate!
 from airflow.operators.python import PythonOperator