Merge pull request apache#2 from apache/main

merge from upstream

.asf.yaml

@@ -66,17 +66,19 @@ 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
-    - paolaperaza
-    - petedejoy
-    - gmcdonald
     - mhenc
-    - ferruzzi
-    - norm
-    - mobuchowski
-    - hussein-awala
+    - pankajkoti
+    - utkarsharma2
+    - Lee-W
+    - sunank200
+    - amoghrajesh
+    - jens-scheffler-bosch
+    - nathadfield
 
 notifications:
   jobs: [email protected]

.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

@@ -42,11 +42,12 @@
 # Add tests and kubernetes_tests to context.
 !tests
 !kubernetes_tests
+!helm_tests
+!docker_tests
 
 !.coveragerc
 !.rat-excludes
 !.dockerignore
-!pytest.ini
 !RELEASE_NOTES.rst
 !LICENSE
 !MANIFEST.in
@@ -57,8 +58,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 +72,7 @@
 # Setup/version configuration
 !setup.cfg
 !setup.py
+!pyproject.toml
 !manifests
 !generated
 # Now - ignore unnecessary files inside allowed directories

.github/CODEOWNERS

@@ -1,10 +1,10 @@
 # Core
-/airflow/executors/ @kaxil @XD-DENG @ashb @o-nikolas
+/airflow/executors/ @kaxil @XD-DENG @ashb @o-nikolas @pierrejeambrun
 /airflow/jobs/ @kaxil @ashb @XD-DENG
 /airflow/models/ @kaxil @XD-DENG @ashb
 
 # DAG Serialization
-/airflow/serialization/ @kaxil @ashb
+/airflow/serialization/ @kaxil @ashb @bolkedebruin
 
 # DAG Parsing
 /airflow/dag_processing @jedcunningham @ephraimbuddy
@@ -25,11 +25,11 @@
 /docs/*.py @kaxil @potiuk
 
 # API
-/airflow/api/ @ephraimbuddy
-/airflow/api_connexion/ @ephraimbuddy
+/airflow/api/ @ephraimbuddy @pierrejeambrun
+/airflow/api_connexion/ @ephraimbuddy @pierrejeambrun
 
 # WWW
-/airflow/www/ @ryanahamilton @ashb @bbovenzi
+/airflow/www/ @ryanahamilton @ashb @bbovenzi @pierrejeambrun
 
 # Security/Permissions
 /airflow/security/permissions.py @jhtimmins
@@ -71,6 +71,7 @@
 /docs/apache-airflow-providers-slack/ @eladkal
 /docs/apache-airflow-providers-cncf-kubernetes @jedcunningham
 /tests/providers/amazon/ @eladkal @o-nikolas
+/tests/system/providers/amazon/ @eladkal @o-nikolas
 /tests/providers/common/sql/ @eladkal
 /tests/providers/slack/ @eladkal
 
@@ -85,8 +86,13 @@ Dockerfile.ci @potiuk @ashb
 
 # Releasing Guides & Project Guidelines
 /dev/README_RELEASE_PROVIDER_PACKAGES.md  @eladkal
-/dev/README_RELEASE_*.md  @kaxil
+/dev/README_RELEASE_*.md  @kaxil @pierrejeambrun
 /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

@@ -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.6.3"
         - "main (development)"
         - "Other Airflow 2 version (please specify below)"
     validations:
@@ -115,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

@@ -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

@@ -28,7 +28,9 @@ body:
         What Apache Airflow Helm Chart version are you using?
       multiple: false
       options:
-        - "1.8.0 (latest released)"
+        - "1.10.0 (latest released)"
+        - "1.9.0"
+        - "1.8.0"
         - "1.7.0"
         - "1.6.0"
         - "1.5.0"
@@ -114,7 +116,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

@@ -34,19 +34,22 @@ body:
         - apache-hdfs
         - apache-hive
         - apache-impala
+        - apache-kafka
         - apache-kylin
         - apache-livy
         - apache-pig
         - apache-pinot
         - apache-spark
         - apache-sqoop
+        - apprise
         - arangodb
         - asana
         - atlassian-jira
         - celery
         - cloudant
         - cncf-kubernetes
         - common-sql
+        - daskexecutor
         - databricks
         - datadog
         - dbt-cloud
@@ -66,6 +69,7 @@ body:
         - influxdb
         - jdbc
         - jenkins
+        - apache-kafka
         - microsoft-azure
         - microsoft-mssql
         - microsoft-psrp
@@ -75,6 +79,7 @@ body:
         - neo4j
         - odbc
         - openfaas
+        - openlineage
         - opsgenie
         - oracle
         - pagerduty
@@ -91,6 +96,7 @@ body:
         - sftp
         - singularity
         - slack
+        - smtp
         - snowflake
         - sqlite
         - ssh
@@ -194,7 +200,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

@@ -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/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,22 @@
+<!--
+ 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.
+ -->
+
 <!--
 Thank you for contributing! Please make sure that your code changes
 are covered with tests. And in case of new features or big changes

.github/SECURITY.md

@@ -0,0 +1,82 @@
+<!--
+ 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.
+-->
+
+This document contains information on how to report security vulnerabilities in Apache Airflow and
+how the security issues reported to Apache Airflow security team are handled. If you would like
+to learn about the security model of Airflow head to
+[Airflow Security](https://airflow.apache.org/docs/apache-airflow/stable/security/)
+
+## Reporting Vulnerabilities
+
+**⚠️ Please do not file GitHub issues for security vulnerabilities as they are public! ⚠️**
+
+The Apache Software Foundation takes security issues very seriously. Apache
+Airflow specifically offers security features and is responsive to issues
+around its features. If you have any concern around Airflow Security or believe
+you have uncovered a vulnerability, we suggest that you get in touch via the
+e-mail address [[email protected]](mailto:[email protected]).
+
+**Only** use the security e-mail address to report undisclosed security vulnerabilities in Apache
+Airflow and to manage the process of fixing such vulnerabilities. We do not accept regular
+bug reports or other security-related queries at this address. We will ignore mail
+sent to this address that does not relate to an undisclosed security problem
+in the Apache Airflow project. Please follow regular communication channels described in
+the [Airflow Community](https://airflow.apache.org/community/index.html) page for
+inquiries, questions and other discussions related to the process or issues.
+
+Specifically, we will ignore results of security scans that contain a list of
+dependencies of Airflow with dependencies in Airflow Docker reference image - there
+is a page that describes how the
+[Airflow reference Image is fixed at release time](https://airflow.apache.org/docs/docker-stack/index.html#fixing-images-at-release-time)
+and providing helpful instructions explaining how you can build your
+own image and manage dependencies of Airflow in your own image.
+
+Please send one plain-text email for each vulnerability you are reporting including an explanation
+of how it affects Airflow security. We may ask that you resubmit your report if you send it as an image,
+movie, HTML, or PDF attachment when you could as easily describe it with plain text.
+
+Before reporting vulnerabilities, please make sure to read and understand the
+[security model](https://airflow.apache.org/docs/apache-airflow/stable/security/) of Airflow, because
+some of the potential security vulnerabilities that are valid for projects that are publicly accessible
+from the Internet, are not valid for Airflow. Airflow is not designed to be used by untrusted users, and some
+trusted users are trusted enough to do a variety of operations that could be considered as vulnerabilities
+in other products/circumstances. Therefore, some potential security vulnerabilities do not
+apply to Airflow, or have a different severity than some generic scoring systems (for example `CVSS`)
+calculation suggests.
+
+The [Airflow Security Team](https://github.com/apache/airflow/blob/main/CONTRIBUTING.rst#security-team) will get back to you after assessing the report.
+
+If you wish to know more about the ASF security process, the
+[ASF Security team's page](https://www.apache.org/security/) describes
+how vulnerability reports are handled in general by all ASF projects, and includes PGP keys if
+you wish to use them when you report the issues.
+
+## Security vulnerabilities in Airflow and Airflow community managed providers
+
+Airflow core package is released separately from provider packages. While Airflow comes with ``constraints``
+which describe which version of providers have been tested when the version of Airflow was released, the
+users of Airflow are advised to install providers independently from Airflow core when they want to apply
+security fixes found and released in providers. Therefore, the issues found and fixed in providers do
+not apply to the Airflow core package. There are also Airflow providers released by 3rd-parties, but the
+Airflow community is not responsible for releasing and announcing security vulnerabilities in them, this
+is handled entirely by the 3rd-parties that release their own providers.
+
+## How are security issues handled in Airflow
+
+Security issues in Airflow are handled by the Airflow Security Team. Details about the Airflow Security Team and how members of it are chosen can be found in the [Contributing documentation](https://github.com/apache/airflow/blob/main/CONTRIBUTING.rst#security-team).