Reorganize tutorials into a section

.pre-commit-config.yaml

@@ -295,7 +295,7 @@ repos:
         exclude: ^airflow/_vendor/|^RELEASE_NOTES\.txt$|^airflow/www/static/css/material-icons\.css$|^images/.*$
         args:
           - --ignore-words=docs/spelling_wordlist.txt
-          - --skip=docs/*/commits.rst,airflow/providers/*/*.rst,*.lock,INTHEWILD.md,*.min.js,docs/apache-airflow/pipeline_example.csv,airflow/www/*.log
+          - --skip=docs/*/commits.rst,airflow/providers/*/*.rst,*.lock,INTHEWILD.md,*.min.js,docs/apache-airflow/tutorial/pipeline_example.csv,airflow/www/*.log
           - --exclude-file=.codespellignorelines
   - repo: local
     hooks:

airflow/example_dags/tutorial_etl_dag.py → airflow/example_dags/tutorial_dag.py

@@ -18,8 +18,8 @@
 
 
 """
-### ETL DAG Tutorial Documentation
-This ETL DAG is demonstrating an Extract -> Transform -> Load pipeline
+### DAG Tutorial Documentation
+This DAG is demonstrating an Extract -> Transform -> Load pipeline
 """
 # [START tutorial]
 # [START import_module]
@@ -38,13 +38,13 @@
 
 # [START instantiate_dag]
 with DAG(
-    'tutorial_etl_dag',
+    'tutorial_dag',
     # [START default_args]
     # These args will get passed on to each operator
     # You can override them on a per-task basis during operator initialization
     default_args={'retries': 2},
     # [END default_args]
-    description='ETL DAG tutorial',
+    description='DAG tutorial',
     schedule=None,
     start_date=pendulum.datetime(2021, 1, 1, tz="UTC"),
     catchup=False,

airflow/example_dags/tutorial_taskflow_api_etl.py → airflow/example_dags/tutorial_taskflow_api.py

@@ -35,10 +35,10 @@
     catchup=False,
     tags=['example'],
 )
-def tutorial_taskflow_api_etl():
+def tutorial_taskflow_api():
     """
     ### TaskFlow API Tutorial Documentation
-    This is a simple ETL data pipeline example which demonstrates the use of
+    This is a simple data pipeline example which demonstrates the use of
     the TaskFlow API using three simple tasks for Extract, Transform, and Load.
     Documentation that goes along with the Airflow TaskFlow API tutorial is
     located
@@ -100,7 +100,7 @@ def load(total_order_value: float):
 
 
 # [START dag_invocation]
-tutorial_etl_dag = tutorial_taskflow_api_etl()
+tutorial_dag = tutorial_taskflow_api()
 # [END dag_invocation]
 
 # [END tutorial]

airflow/example_dags/tutorial_taskflow_api_etl_virtualenv.py → airflow/example_dags/tutorial_taskflow_api_virtualenv.py

@@ -26,16 +26,14 @@
 log = logging.getLogger(__name__)
 
 if not shutil.which("virtualenv"):
-    log.warning(
-        "The tutorial_taskflow_api_etl_virtualenv example DAG requires virtualenv, please install it."
-    )
+    log.warning("The tutorial_taskflow_api_virtualenv example DAG requires virtualenv, please install it.")
 else:
 
     @dag(schedule=None, start_date=datetime(2021, 1, 1), catchup=False, tags=['example'])
-    def tutorial_taskflow_api_etl_virtualenv():
+    def tutorial_taskflow_api_virtualenv():
         """
         ### TaskFlow API example using virtualenv
-        This is a simple ETL data pipeline example which demonstrates the use of
+        This is a simple data pipeline example which demonstrates the use of
         the TaskFlow API using three simple tasks for Extract, Transform, and Load.
         """
 
@@ -86,4 +84,4 @@ def load(total_order_value: float):
         order_summary = transform(order_data)
         load(order_summary["total_order_value"])
 
-    tutorial_etl_dag = tutorial_taskflow_api_etl_virtualenv()
+    tutorial_dag = tutorial_taskflow_api_virtualenv()

docs/apache-airflow/concepts/taskflow.rst

@@ -61,7 +61,7 @@ You can also use a plain value or variable to call a TaskFlow function - for exa
 
     hello_name('Airflow users')
 
-If you want to learn more about using TaskFlow, you should consult :doc:`the TaskFlow tutorial </tutorial_taskflow_api>`.
+If you want to learn more about using TaskFlow, you should consult :doc:`the TaskFlow tutorial </tutorial/taskflow>`.
 
 Context
 -------

docs/apache-airflow/howto/docker-compose/index.rst

@@ -283,7 +283,7 @@ The Docker Compose file uses the latest Airflow image (`apache/airflow <https://
 What's Next?
 ============
 
-From this point, you can head to the :doc:`/tutorial` section for further examples or the :doc:`/howto/index` section if you're ready to get your hands dirty.
+From this point, you can head to the :doc:`/tutorial/index` section for further examples or the :doc:`/howto/index` section if you're ready to get your hands dirty.
 
 .. _docker-compose-env-variables:
 

docs/apache-airflow/index.rst

@@ -131,8 +131,7 @@ so coding will always be required.
     start
     installation/index
     upgrading-from-1-10/index
-    tutorial
-    tutorial_taskflow_api
+    tutorial/index
     howto/index
     ui
     concepts/index

docs/apache-airflow/redirects.txt

@@ -61,3 +61,7 @@ upgrading-to-2.rst upgrading-from-1-10/index.rst
 
 # Release Notes
 changelog.rst release_notes.rst
+
+# Tutorials
+tutorial.rst tutorial/index.rst
+tutorial_taskflow_api.rst tutorial/taskflow.rst

docs/apache-airflow/start.rst

@@ -115,4 +115,4 @@ the all-in-one ``standalone`` command, you can instead run:
 
 What's Next?
 ''''''''''''
-From this point, you can head to the :doc:`/tutorial` section for further examples or the :doc:`/howto/index` section if you're ready to get your hands dirty.
+From this point, you can head to the :doc:`/tutorial/index` section for further examples or the :doc:`/howto/index` section if you're ready to get your hands dirty.