Merge branch 'main' into fix/deferrable_k8s_pod_op

.asf.yaml

@@ -66,6 +66,9 @@ github:
     v2-5-stable:
       required_pull_request_reviews:
         required_approving_review_count: 1
+    v2-6-stable:
+      required_pull_request_reviews:
+        required_approving_review_count: 1
 
   collaborators:
     - auvipy
@@ -74,7 +77,7 @@ github:
     - gmcdonald
     - mhenc
     - ferruzzi
-    - norm
+    - mobuchowski
 
 notifications:
   jobs: jobs@airflow.apache.org

.codespellignorelines

@@ -3,3 +3,4 @@
     roles = relationship("Role", secondary=assoc_user_role, backref="user", lazy="selectin")
     The platform supports **C**reate, **R**ead, **U**pdate, and **D**elete operations on most resources.
 <pre><code>Code block\ndoes not\nrespect\nnewlines\n</code></pre>
+      "trough",

.coveragerc

@@ -27,6 +27,7 @@ omit =
     airflow/migrations/**
     airflow/providers/**/example_dags/**
     airflow/www/node_modules/**
+    airflow/providers/google/ads/_vendor/**
 
 [report]
 skip_empty = True

.dockerignore

@@ -46,7 +46,6 @@
 !.coveragerc
 !.rat-excludes
 !.dockerignore
-!pytest.ini
 !RELEASE_NOTES.rst
 !LICENSE
 !MANIFEST.in
@@ -57,8 +56,8 @@
 
 # This folder is for you if you want to add any packages to the docker context when you build your own
 # docker image. most of other files and any new folder you add will be excluded by default
-# if you need other types of files - please add the extensions here.
 !docker-context-files
+!constraints
 
 # Avoid triggering context change on README change (new companies using Airflow)
 # So please do not uncomment this line ;)
@@ -71,6 +70,7 @@
 # Setup/version configuration
 !setup.cfg
 !setup.py
+!pyproject.toml
 !manifests
 !generated
 # Now - ignore unnecessary files inside allowed directories

.github/CODEOWNERS

@@ -4,7 +4,7 @@
 /airflow/models/ @kaxil @XD-DENG @ashb
 
 # DAG Serialization
-/airflow/serialization/ @kaxil @ashb
+/airflow/serialization/ @kaxil @ashb @bolkedebruin
 
 # DAG Parsing
 /airflow/dag_processing @jedcunningham @ephraimbuddy
@@ -84,8 +84,14 @@ Dockerfile.ci @potiuk @ashb
 /docker_tests/ @potiuk @ashb
 
 # Releasing Guides & Project Guidelines
-/dev/README_RELEASE_PROVIDER_PACKAGES  @eladkal
+/dev/README_RELEASE_PROVIDER_PACKAGES.md  @eladkal
 /dev/README_RELEASE_*.md  @kaxil
 /dev/README.md  @kaxil
 /dev/PROJECT_GUIDELINES.md  @kaxil
 /dev/PROVIDER_PACKAGE_DETAILS.md  @kaxil
+ISSUE_TRIAGE_PROCESS.rst @eladkal
+
+# AIP-52 - Setup and Teardown
+/airflow/decorators/setup_teardown.py @jedcunningham @ephraimbuddy @dstandish
+/airflow/utils/setup_teardown.py @jedcunningham @ephraimbuddy @dstandish
+/airflow/example_dags/example_setup_teardown*.py @jedcunningham @ephraimbuddy @dstandish

.github/ISSUE_TEMPLATE/airflow_bug_report.yml

@@ -1,7 +1,7 @@
 ---
 name: Airflow Bug report
 description: Problems and issues with code in Apache Airflow core
-labels: ["kind:bug", "area:core"]
+labels: ["kind:bug", "area:core", "needs-triage"]
 body:
   - type: markdown
     attributes:
@@ -25,7 +25,7 @@ body:
         the latest release or main to see if the issue is fixed before reporting it.
       multiple: false
       options:
-        - "2.5.1"
+        - "2.5.3"
         - "main (development)"
         - "Other Airflow 2 version (please specify below)"
     validations:
@@ -58,6 +58,8 @@ body:
         as minimally and precisely as possible. Keep in mind we do not have access to your cluster or DAGs.
         Remember that non-reproducible issues will be closed! Opening a discussion is recommended as a
         first step.
+    validations:
+      required: true
   - type: input
     attributes:
       label: Operating System
@@ -84,8 +86,9 @@ body:
         - "Other Docker-based deployment"
         - "Virtualenv installation"
         - "Astronomer"
-        - "Composer"
-        - "MWAA"
+        - "Google Cloud Composer"
+        - "Amazon (AWS) MWAA"
+        - "Microsoft ADF Managed Airflow"
         - "Other"
     validations:
       required: true
@@ -112,7 +115,7 @@ body:
         This is absolutely not required, but we are happy to guide you in the contribution process
         especially if you already have a good understanding of how to implement the fix.
         Airflow is a community-managed project and we love to bring new contributors in.
-        Find us in #airflow-how-to-pr on Slack!
+        Find us in #development-first-pr-support on Slack!
       options:
         - label: Yes I am willing to submit a PR!
   - type: checkboxes

.github/ISSUE_TEMPLATE/airflow_doc_issue_report.yml

@@ -1,7 +1,7 @@
 ---
 name: Airflow Doc issue report
 description: Problems and issues with Apache Airflow documentation
-labels: ["kind:bug", "kind:documentation"]
+labels: ["kind:bug", "kind:documentation", "needs-triage"]
 body:
   - type: markdown
     attributes:
@@ -50,7 +50,7 @@ body:
         This is absolutely not required, but we are happy to guide you in the contribution process
         especially if you already have a good understanding of how to implement the fix.
         Airflow is a community-managed project and we love to bring new contributors in.
-        Find us in #airflow-how-to-pr on Slack!
+        Find us in #development-first-pr-support on Slack!
       options:
         - label: Yes I am willing to submit a PR!
   - type: checkboxes

.github/ISSUE_TEMPLATE/airflow_helmchart_bug_report.yml

@@ -1,7 +1,7 @@
 ---
 name: Airflow Helm Chart Bug report
 description: Problems and issues with the Apache Airflow Official Helm Chart
-labels: ["kind:bug", "area:helm-chart"]
+labels: ["kind:bug", "area:helm-chart", "needs-triage"]
 body:
   - type: markdown
     attributes:
@@ -28,7 +28,8 @@ body:
         What Apache Airflow Helm Chart version are you using?
       multiple: false
       options:
-        - "1.8.0 (latest released)"
+        - "1.9.0 (latest released)"
+        - "1.8.0"
         - "1.7.0"
         - "1.6.0"
         - "1.5.0"
@@ -96,6 +97,8 @@ body:
         as minimally and precisely as possible. Keep in mind we do not have access to your cluster or DAGs.
         Remember that non-reproducible issues will be closed! Opening a discussion is recommended as a
         first step.
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: Anything else
@@ -112,7 +115,7 @@ body:
         This is absolutely not required, but we are happy to guide you in the contribution process
         especially if you already have a good understanding of how to implement the fix.
         Airflow is a community-managed project and we love to bring new contributors in.
-        Find us in #airflow-how-to-pr on Slack!
+        Find us in #development-first-pr-support on Slack!
       options:
         - label: Yes I am willing to submit a PR!
   - type: checkboxes

.github/ISSUE_TEMPLATE/airflow_providers_bug_report.yml

@@ -1,7 +1,7 @@
 ---
 name: Airflow Providers Bug report
 description: Problems and issues with code in Apache Airflow Providers
-labels: ["kind:bug", "area:providers"]
+labels: ["kind:bug", "area:providers", "needs-triage"]
 body:
   - type: markdown
     attributes:
@@ -75,6 +75,7 @@ body:
         - neo4j
         - odbc
         - openfaas
+        - openlineage
         - opsgenie
         - oracle
         - pagerduty
@@ -91,6 +92,7 @@ body:
         - sftp
         - singularity
         - slack
+        - smtp
         - snowflake
         - sqlite
         - ssh
@@ -137,8 +139,9 @@ body:
         - "Other Docker-based deployment"
         - "Virtualenv installation"
         - "Astronomer"
-        - "Composer"
-        - "MWAA"
+        - "Google Cloud Composer"
+        - "Amazon (AWS) MWAA"
+        - "Microsoft ADF Managed Airflow"
         - "Other"
     validations:
       required: true
@@ -175,6 +178,8 @@ body:
         as minimally and precisely as possible. Keep in mind we do not have access to your cluster or
         DAGs. Remember that non-reproducible issues will be closed! Opening a discussion is
         recommended as a first step.
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: Anything else
@@ -191,7 +196,7 @@ body:
         This is absolutely not required, but we are happy to guide you in the contribution process
         especially if you already have a good understanding of how to implement the fix.
         Airflow is a community-managed project and we love to bring new contributors in.
-        Find us in #airflow-how-to-pr on Slack!
+        Find us in #development-first-pr-support on Slack!
       options:
         - label: Yes I am willing to submit a PR!
   - type: checkboxes

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,7 +1,7 @@
 ---
 name: Airflow feature request
 description: Suggest an idea for this project
-labels: ["kind:feature"]
+labels: ["kind:feature", "needs-triage"]
 body:
   - type: markdown
     attributes:
@@ -52,8 +52,9 @@ body:
         If want to submit a PR you do not need to open feature request, <b>just create the PR!</b>.
         Especially if you already have a good understanding of how to implement the feature.
         Airflow is a community-managed project and we love to bring new contributors in.
-        Find us in #airflow-how-to-pr on Slack! It's optional though - if you have good idea for small
-        feature, others might implement it if they pick an interest in it, so feel free to leave that
+        Find us in #development-first-pr-support on Slack!
+        It's optional though - if you have good idea for small feature,
+        others might implement it if they pick an interest in it, so feel free to leave that
         checkbox unchecked.
       options:
         - label: Yes I am willing to submit a PR!

.github/actions/breeze/action.yml

@@ -35,8 +35,10 @@ runs:
       uses: actions/cache@v3
       with:
         path: ~/.local/pipx
-        key: "breeze-${{ hashFiles('dev/breeze/README.md') }}"  # README has the latest breeze's hash
-        restore-keys: breeze-
+        # README has the latest breeze's hash and python location is used to distinguish between
+        # different minor versions of python
+        key: "breeze-${{ env.pythonLocation }}-${{ hashFiles('dev/breeze/README.md') }}"
+        restore-keys: breeze-${{ env.pythonLocation }}
     - name: "Install Breeze"
       shell: bash
       run: ./scripts/ci/install_breeze.sh