pull master

.asf.yaml

@@ -39,7 +39,7 @@ github:
   enabled_merge_buttons:
     squash: true
     merge: false
-    rebase: true
+    rebase: false
 
   protected_branches:
     main:
@@ -57,9 +57,15 @@ github:
     v2-2-stable:
       required_pull_request_reviews:
         required_approving_review_count: 1
+    v2-3-stable:
+      required_pull_request_reviews:
+        required_approving_review_count: 1
 
   collaborators:
     - auvipy
     - paolaperaza
     - petedejoy
     - gmcdonald
+
+notifications:
+  jobs: jobs@airflow.apache.org

.codespellignorelines

@@ -1,2 +1,3 @@
             f"DELETE {source_table} FROM { ', '.join(_from_name(tbl) for tbl in stmt.froms) }"
         for frm in source_query.selectable.froms:
+    roles = relationship("Role", secondary=assoc_user_role, backref="user", lazy="selectin")

.devcontainer/devcontainer.json

@@ -1,10 +1,9 @@
 {
-    "name": "Apache Airflow",
+    "name": "Apache Airflow - sqlite",
     "dockerComposeFile": [
         "../scripts/ci/docker-compose/devcontainer.yml",
         "../scripts/ci/docker-compose/local.yml",
-        "../scripts/ci/docker-compose/backend-postgres.yml",
-        "../scripts/ci/docker-compose/devcontainer-postgres.yml"
+        "../scripts/ci/docker-compose/backend-sqlite.yml",
     ],
     "extensions": [
         "ms-python.python",

.devcontainer/mysql/devcontainer.json

@@ -0,0 +1,24 @@
+{
+    "name": "Apache Airflow - mysql",
+    "dockerComposeFile": [
+        "../scripts/ci/docker-compose/devcontainer.yml",
+        "../scripts/ci/docker-compose/local.yml",
+        "../scripts/ci/docker-compose/backend-mysql.yml",
+        "../scripts/ci/docker-compose/devcontainer-mysql.yml"
+    ],
+    "extensions": [
+        "ms-python.python",
+        "ms-python.vscode-pylance",
+        "mtxr.sqltools",
+        "mtxr.sqltools-driver-pg",
+        "rogalmic.bash-debug",
+        "ms-azuretools.vscode-docker",
+        "dbaeumer.vscode-eslint",
+        "ecmel.vscode-html-css",
+        "timonwong.shellcheck",
+        "redhat.vscode-yaml",
+        "rogalmic.bash-debug"
+    ],
+    "service": "airflow",
+    "forwardPorts": [8080,5555,5432,6379]
+}

.devcontainer/postgres/devcontainer.json

@@ -0,0 +1,24 @@
+{
+    "name": "Apache Airflow - postgres",
+    "dockerComposeFile": [
+        "../scripts/ci/docker-compose/devcontainer.yml",
+        "../scripts/ci/docker-compose/local.yml",
+        "../scripts/ci/docker-compose/backend-postgres.yml",
+        "../scripts/ci/docker-compose/devcontainer-postgres.yml"
+    ],
+    "extensions": [
+        "ms-python.python",
+        "ms-python.vscode-pylance",
+        "mtxr.sqltools",
+        "mtxr.sqltools-driver-pg",
+        "rogalmic.bash-debug",
+        "ms-azuretools.vscode-docker",
+        "dbaeumer.vscode-eslint",
+        "ecmel.vscode-html-css",
+        "timonwong.shellcheck",
+        "redhat.vscode-yaml",
+        "rogalmic.bash-debug"
+    ],
+    "service": "airflow",
+    "forwardPorts": [8080,5555,5432,6379]
+}

.dockerignore

@@ -49,12 +49,13 @@
 !.flake8
 !.dockerignore
 !pytest.ini
-!CHANGELOG.txt
+!RELEASE_NOTES.rst
 !LICENSE
 !MANIFEST.in
 !NOTICE
 !.github
 !empty
+!Dockerfile
 
 # 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

.editorconfig

@@ -26,6 +26,7 @@ charset = utf-8
 
 [*.py]
 indent_size = 4
+max_line_length = 110
 
 [*.sh]
 indent_size = 4
@@ -44,6 +45,7 @@ indent_size = 2
 
 [*.{yml,yaml}]
 indent_size = 2
+max_line_length = 110
 
 [*.{htm,html}]
 indent_size = 2

.gitattributes

@@ -1,3 +1,45 @@
-tests/** export-ignore
-tests/ export-ignore
-chart/tests export-ignore
+breeze export-ignore
+breeze-legacy export-ignore
+breeze-complete export-ignore
+clients export-ignore
+clients export-ignore
+dev export-ignore
+docker-context-files export-ignore
+docker_tests export-ignore
+empty export-ignore
+kubernetes_tests export-ignore
+manifests export-ignore
+newsfragments export-ignore
+scripts export-ignore
+tests export-ignore
+
+Dockerfile.ci export-ignore
+
+ISSUE_TRIAGE_PROCESS.rst export-ignore
+PULL_REQUEST_WORKFLOW.rst export-ignore
+SELECTIVE_CHECKS.md export-ignore
+STATIC_CODE_CHECKS.rst export-ignore
+TESTING.rst export-ignore
+LOCAL_VIRTUALENV.rst export-ignore
+CONTRIBUTING.rst export-ignore
+BREEZE.rst export-ignore
+CI.rst export-ignore
+CI_DIAGRAMS.md export-ignore
+CONTRIBUTORS_QUICK_START.rst export-ignore
+
+.devcontainer export-ignore
+.github export-ignore
+.coveragerc export-ignore
+.readthedocs.yml export-ignore
+.hadolint.yaml export-ignore
+.pre-commit-config.yaml export-ignore
+.mailmap export-ignore
+.editorconfig export-ignore
+.flake8 export-ignore
+.inputrc export-ignore
+.codespellignorelines export-ignore
+.gitmodules export-ignore
+.gitpod.yml export-ignore
+.markdownlint.yml export-ignore
+.bash_completion export-ignore
+.asf.yaml export-ignore

.github/ISSUE_TEMPLATE/airflow_bug_report.yml

@@ -1,6 +1,6 @@
 ---
 name: Airflow Bug report
-description: Problems and issues with code of Apache Airflow core
+description: Problems and issues with code in Apache Airflow core
 labels: ["kind:bug", "area:core"]
 body:
   - type: markdown
@@ -10,22 +10,25 @@ body:
         <img src='https://raw.githubusercontent.com/apache/airflow/main/docs/apache-airflow/img/logos/airflow_64x64_emoji_transparent.png' align='left' width='80' height='80'>
         Thank you for finding the time to report the problem!
 
-        We really appreciate the community efforts to improve Airflow.
+        We really appreciate the community's efforts to improve Airflow.
 
-        Note, that you do not need to create an issue if you have a change ready to submit!
+        Note, you do not need to create an issue if you have a change ready to submit!
 
-        You can open [Pull Request](https://github.com/apache/airflow/pulls) immediately instead.
+        You can open a [pull request](https://github.com/apache/airflow/pulls) immediately instead.
         <br clear='left'/>"
       # yamllint enable rule:line-length
   - type: dropdown
     attributes:
       label: Apache Airflow version
       description: >
         What Apache Airflow version are you using? Only Airflow 2 is supported for bugs. If you wish to
-        discuss Airflow 1.10, open [Discussion](https://github.com/apache/airflow/discussions) instead!
+        discuss Airflow 1.10, open a [discussion](https://github.com/apache/airflow/discussions) instead!
       multiple: false
       options:
-        - "2.2.4 (latest released)"
+        - "2.3.1 (latest released)"
+        - "2.3.0"
+        - "2.2.5"
+        - "2.2.4"
         - "2.2.3"
         - "2.2.2"
         - "2.2.1"
@@ -63,7 +66,7 @@ body:
       label: How to reproduce
       description: >
         What should we do to reproduce the problem? If you are not able to provide a reproducible case,
-        please open a [Discussion](https://github.com/apache/airflow/discussions) instead.
+        please open a [discussion](https://github.com/apache/airflow/discussions) instead.
       placeholder: >
         Please make sure you provide a reproducible step-by-step case of how to reproduce the problem
         as minimally and precisely as possible. Keep in mind we do not have access to your cluster or DAGs.
@@ -85,7 +88,7 @@ body:
     attributes:
       label: Deployment
       description: >
-        What kind of deployment do you have? If you use Managed Service, consider first using regular
+        What kind of deployment do you have? If you use a Managed Service, consider first using regular
         channels of reporting issues for the service.
       multiple: false
       options:
@@ -129,7 +132,8 @@ body:
   - type: checkboxes
     attributes:
       label: Code of Conduct
-      description: The Code of Conduct helps create a safe space for everyone. We require
+      description: >
+        The Code of Conduct helps create a safe space for everyone. We require
         that everyone agrees to it.
       options:
         - label: >

.github/ISSUE_TEMPLATE/airflow_doc_issue_report.yml

@@ -1,6 +1,6 @@
 ---
 name: Airflow Doc issue report
-description: Problems and issues with docs of Apache Airflow
+description: Problems and issues with Apache Airflow documentation
 labels: ["kind:bug", "kind:documentation"]
 body:
   - type: markdown
@@ -10,11 +10,11 @@ body:
         <img src='https://raw.githubusercontent.com/apache/airflow/main/docs/apache-airflow/img/logos/airflow_64x64_emoji_transparent.png' align='left' width='80' height='80'>
         Thank you for finding the time to report the problem!
 
-        We really appreciate the community efforts to improve Airflow.
+        We really appreciate the community's efforts to improve Airflow.
 
-        Note, that you do not need to create an issue if you have a change ready to submit!
+        Note, you do not need to create an issue if you have a change ready to submit!
 
-        You can open [Pull Request](https://github.com/apache/airflow/pulls) immediately instead.
+        You can open a [pull request](https://github.com/apache/airflow/pulls) immediately instead.
         <br clear='left'/>"
       # yamllint enable rule:line-length
   - type: textarea
@@ -56,7 +56,8 @@ body:
   - type: checkboxes
     attributes:
       label: Code of Conduct
-      description: The Code of Conduct helps create a safe space for everyone. We require
+      description: >
+        The Code of Conduct helps create a safe space for everyone. We require
         that everyone agrees to it.
       options:
         - label: >

.github/ISSUE_TEMPLATE/airflow_helmchart_bug_report.yml

@@ -1,6 +1,6 @@
 ---
 name: Airflow Helm Chart Bug report
-description: Problems and issues with Apache Airflow Official Helm Chart
+description: Problems and issues with the Apache Airflow Official Helm Chart
 labels: ["kind:bug", "area:helm-chart"]
 body:
   - type: markdown
@@ -10,15 +10,15 @@ body:
         <img src='https://raw.githubusercontent.com/apache/airflow/main/docs/apache-airflow/img/logos/airflow_64x64_emoji_transparent.png' align='left' width='120' height='120'>
         Thank you for finding the time to report the problem!
 
-        We really appreciate the community efforts to improve Airflow.
+        We really appreciate the community's efforts to improve Airflow.
 
         Note that this issue is only for the
         [Official Apache Airflow Helm Chart](https://airflow.apache.org/docs/helm-chart/stable/index.html).
         If you use another 3rd-party Chart, you should report your issue in the repo of that chart instead.
 
-        Note, that you do not need to create an issue if you have a change ready to submit!
+        Note, you do not need to create an issue if you have a change ready to submit!
 
-        You can open [Pull Request](https://github.com/apache/airflow/pulls) immediately instead.
+        You can open a [pull request](https://github.com/apache/airflow/pulls) immediately instead.
         <br clear='left'/>"
       # yamllint enable rule:line-length
   - type: dropdown
@@ -28,7 +28,9 @@ body:
         What Apache Airflow Helm Chart version are you using?
       multiple: false
       options:
-        - "1.4.0 (latest released)"
+        - "1.6.0 (latest released)"
+        - "1.5.0"
+        - "1.4.0"
         - "1.3.0"
         - "1.2.0"
         - "1.1.0"
@@ -41,10 +43,13 @@ body:
       label: Apache Airflow version
       description: >
         What Apache Airflow version are you using? Only Airflow 2 is supported for bugs. If you wish to
-        discuss Airflow 1.10, open [Discussion](https://github.com/apache/airflow/discussions) instead!
+        discuss Airflow 1.10, open a [discussion](https://github.com/apache/airflow/discussions) instead!
       multiple: false
       options:
-        - "2.2.4 (latest released)"
+        - "2.3.1 (latest released)"
+        - "2.3.0"
+        - "2.2.5"
+        - "2.2.4"
         - "2.2.3"
         - "2.2.2"
         - "2.2.1"
@@ -79,9 +84,9 @@ body:
       label: Docker Image customisations
       description: What are the specific modification you've made in your image?
       placeholder: >
-          Did you extend or customise the official Airflow image? Did you add any packages? Maybe
-          you can share link to your image, or copy the Dockerfile and `docker build` commands
-          you used to build the image? Make sure to surround the code you paste with ``` ```.
+        Did you extend or customise the official Airflow image? Did you add any packages? Maybe
+        you can share a link to your image, or copy the Dockerfile and `docker build` commands
+        you used to build the image? Make sure to surround the code you paste with ``` ```.
   - type: textarea
     attributes:
       label: What happened
@@ -130,7 +135,8 @@ body:
   - type: checkboxes
     attributes:
       label: Code of Conduct
-      description: The Code of Conduct helps create a safe space for everyone. We require
+      description: >
+        The Code of Conduct helps create a safe space for everyone. We require
         that everyone agrees to it.
       options:
         - label: >