You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2022/06/05 09:27:39 UTC

[airflow] branch main updated: AIP-47 - Migrate drill DAGs to new design #22439 (#24206)

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new a27206915b AIP-47 - Migrate drill DAGs to new design #22439 (#24206)
a27206915b is described below

commit a27206915bfe958e70de3041c0d0ded6bc0b1c02
Author: chethanuk-plutoflume <ch...@tessian.com>
AuthorDate: Sun Jun 5 10:27:32 2022 +0100

    AIP-47 - Migrate drill DAGs to new design #22439 (#24206)
---
 airflow/providers/apache/drill/example_dags/__init__.py  | 16 ----------------
 docs/apache-airflow-providers-apache-drill/index.rst     |  2 +-
 docs/apache-airflow-providers-apache-drill/operators.rst |  2 +-
 .../system/providers/apache/drill}/example_drill_dag.py  | 12 +++++++++++-
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/airflow/providers/apache/drill/example_dags/__init__.py b/airflow/providers/apache/drill/example_dags/__init__.py
deleted file mode 100644
index 13a83393a9..0000000000
--- a/airflow/providers/apache/drill/example_dags/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
diff --git a/docs/apache-airflow-providers-apache-drill/index.rst b/docs/apache-airflow-providers-apache-drill/index.rst
index d3d85f780f..bc5456ca83 100644
--- a/docs/apache-airflow-providers-apache-drill/index.rst
+++ b/docs/apache-airflow-providers-apache-drill/index.rst
@@ -38,7 +38,7 @@ Content
     :maxdepth: 1
     :caption: Resources
 
-    Example DAGs <https://github.com/apache/airflow/tree/main/airflow/providers/apache/drill/example_dags>
+    Example DAGs <https://github.com/apache/airflow/tree/main/tests/system/providers/apache/drill>
     PyPI Repository <https://pypi.org/project/apache-airflow-providers-apache-drill/>
     Installing from sources <installing-providers-from-sources>
 
diff --git a/docs/apache-airflow-providers-apache-drill/operators.rst b/docs/apache-airflow-providers-apache-drill/operators.rst
index 55025f9776..cadc534ae6 100644
--- a/docs/apache-airflow-providers-apache-drill/operators.rst
+++ b/docs/apache-airflow-providers-apache-drill/operators.rst
@@ -34,7 +34,7 @@ Executes one or more SQL queries on an Apache Drill server.  The ``sql`` paramet
 Using the operator
 """"""""""""""""""
 
-.. exampleinclude:: /../../airflow/providers/apache/drill/example_dags/example_drill_dag.py
+.. exampleinclude:: /../../tests/system/providers/apache/drill/example_drill_dag.py
     :language: python
     :dedent: 4
     :start-after: [START howto_operator_drill]
diff --git a/airflow/providers/apache/drill/example_dags/example_drill_dag.py b/tests/system/providers/apache/drill/example_drill_dag.py
similarity index 83%
rename from airflow/providers/apache/drill/example_dags/example_drill_dag.py
rename to tests/system/providers/apache/drill/example_drill_dag.py
index d41e9e503a..9c72170301 100644
--- a/airflow/providers/apache/drill/example_dags/example_drill_dag.py
+++ b/tests/system/providers/apache/drill/example_drill_dag.py
@@ -19,13 +19,18 @@
 """
 Example Airflow DAG to execute SQL in an Apache Drill environment using the `DrillOperator`.
 """
+
+import os
 from datetime import datetime
 
 from airflow.models import DAG
 from airflow.providers.apache.drill.operators.drill import DrillOperator
 
+ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID")
+DAG_ID = "example_drill_dag"
+
 with DAG(
-    dag_id='example_drill_dag',
+    dag_id=DAG_ID,
     schedule_interval=None,
     start_date=datetime(2021, 1, 1),
     catchup=False,
@@ -40,3 +45,8 @@ with DAG(
         ''',
     )
     # [END howto_operator_drill]
+
+from tests.system.utils import get_test_run  # noqa: E402
+
+# Needed to run the example DAG with pytest (see: tests/system/README.md#run_via_pytest)
+test_run = get_test_run(dag)