Merge branch 'apache:main' into master

.asf.yaml

@@ -20,14 +20,33 @@
 github:
   description: "Apache Airflow - A platform to programmatically author, schedule, and monitor workflows"
   homepage: https://airflow.apache.org/
+  # Social media preview image is not supported by Github API/asf.yaml, need to be uploaded
+  # manually in Github repository --> Settings --> click "Edit" in "Social preview"
+  # See also:
+  # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/customizing-your-repositorys-social-media-preview
+  # social_media_preview: docs/apache-airflow/img/logos/github_repository_social_image.png
   labels:
+    # Note that Github only supports <=20 labels/topics per repo! Pipeline will fail if you add more.
     - airflow
     - apache
     - apache-airflow
-    - hacktoberfest
+    - automation
+    - dag
+    - data-engineering
+    - data-integration
+    - data-orchestrator
+    - data-pipelines
+    - data-science
+    - elt
+    - etl
+    - machine-learning
+    - mlops
+    - orchestration
     - python
     - scheduler
     - workflow
+    - workflow-engine
+    - workflow-orchestration
   features:
     # Enable issues management
     issues: true
@@ -39,30 +58,63 @@ github:
   enabled_merge_buttons:
     squash: true
     merge: false
-    rebase: true
+    rebase: false
 
   protected_branches:
     main:
       required_pull_request_reviews:
         required_approving_review_count: 1
+      required_linear_history: true
+      required_conversation_resolution: true
     v1-10-stable:
       required_pull_request_reviews:
         required_approving_review_count: 1
     v2-0-stable:
       required_pull_request_reviews:
         required_approving_review_count: 1
+      required_linear_history: true
     v2-1-stable:
       required_pull_request_reviews:
         required_approving_review_count: 1
+      required_linear_history: true
     v2-2-stable:
       required_pull_request_reviews:
         required_approving_review_count: 1
-
+      required_linear_history: true
+    v2-3-stable:
+      required_pull_request_reviews:
+        required_approving_review_count: 1
+      required_linear_history: true
+    v2-4-stable:
+      required_pull_request_reviews:
+        required_approving_review_count: 1
+      required_linear_history: true
+    v2-5-stable:
+      required_pull_request_reviews:
+        required_approving_review_count: 1
+      required_linear_history: true
+    v2-6-stable:
+      required_pull_request_reviews:
+        required_approving_review_count: 1
+      required_linear_history: true
+    v2-7-stable:
+      required_pull_request_reviews:
+        required_approving_review_count: 1
+      required_linear_history: true
+    v2-8-stable:
+      required_pull_request_reviews:
+        required_approving_review_count: 1
+      required_linear_history: true
   collaborators:
-    - auvipy
-    - paolaperaza
-    - petedejoy
-    - gmcdonald
+    - Lee-W
+    - RNHTTR
+    - aritra24
+    - dirrao
+    - mhenc
+    - nathadfield
+    - sunank200
+    - vatsrahul1001
+    - cmarteepants
 
 notifications:
   jobs: [email protected]

.codespellignorelines

@@ -1,3 +1,6 @@
             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")
+    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",

.devcontainer/devcontainer.json

@@ -1,11 +1,12 @@
 {
-    "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"
     ],
+    "settings": {
+        "terminal.integrated.defaultProfile.linux": "bash"
+    },
     "extensions": [
         "ms-python.python",
         "ms-python.vscode-pylance",
@@ -20,5 +21,10 @@
         "rogalmic.bash-debug"
     ],
     "service": "airflow",
-    "forwardPorts": [8080,5555,5432,6379]
+    "forwardPorts": [8080, 5555, 5432, 6379],
+    "workspaceFolder": "/opt/airflow",
+    // for users who use non-standard git config patterns
+    // https://github.com/microsoft/vscode-remote-release/issues/2084#issuecomment-989756268
+    "initializeCommand": "cd \"${localWorkspaceFolder}\" && git config --local user.email \"$(git config user.email)\" && git config --local user.name \"$(git config user.name)\"",
+    "overrideCommand": true
 }

.devcontainer/mysql/devcontainer.json

@@ -0,0 +1,26 @@
+{
+    "name": "Apache Airflow - mysql",
+    "dockerComposeFile": [
+        "../../scripts/ci/docker-compose/devcontainer.yml",
+        "../../scripts/ci/docker-compose/backend-mysql.yml",
+        "../../scripts/ci/docker-compose/devcontainer-mysql.yml"
+    ],
+    "settings": {
+        "terminal.integrated.defaultProfile.linux": "bash"
+    },
+    "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,26 @@
+{
+    "name": "Apache Airflow - postgres",
+    "dockerComposeFile": [
+        "../../scripts/ci/docker-compose/devcontainer.yml",
+        "../../scripts/ci/docker-compose/backend-postgres.yml",
+        "../../scripts/ci/docker-compose/devcontainer-postgres.yml"
+    ],
+    "settings": {
+        "terminal.integrated.defaultProfile.linux": "bash"
+    },
+    "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

@@ -34,33 +34,29 @@
 !chart
 !docs
 !licenses
-!metastore_browser
 
 # Add those folders to the context so that they are available in the CI container
-!scripts/in_container
-!scripts/docker
+!scripts
 
 # Add tests and kubernetes_tests to context.
 !tests
 !kubernetes_tests
+!helm_tests
+!docker_tests
 
-!.coveragerc
 !.rat-excludes
-!.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
-# 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,22 +67,16 @@
 !.bash_completion.d
 
 # Setup/version configuration
-!setup.cfg
-!setup.py
+!pyproject.toml
 !manifests
+!generated
 # Now - ignore unnecessary files inside allowed directories
 # This goes after the allowed directories
 
 # Git version is dynamically generated
 airflow/git_version
-
-# Exclude static www files generated by NPM
-airflow/www/static/coverage
-airflow/www/static/dist
+# Exclude mode_modules pulled by "yarn" for compilation of www files generated by NPM
 airflow/www/node_modules
-# Exclude static ui files generated by NPM
-airflow/ui/build
-airflow/ui/node_modules
 
 # Exclude link to docs
 airflow/www/static/docs
@@ -99,7 +89,7 @@ airflow/www/static/docs
 **/env/
 **/build/
 **/develop-eggs/
-**/dist/
+/dist/
 **/downloads/
 **/eggs/
 **/.eggs/
@@ -128,3 +118,7 @@ airflow/www/static/docs
 docs/_build/
 docs/_api/
 docs/_doctrees/
+
+# files generated by memray
+*.py.*.html
+*.py.*.bin

.git-blame-ignore-revs

@@ -0,0 +1,11 @@
+# Black enabled.
+4e8f9cc8d02b29c325b8a5a76b4837671bdf5f68
+fdd9b6f65b608c516b8a062b058972d9a45ec9e3
+
+# PEP-563 (Postponed Evaluation of Annotations).
+d67ac5932dabbf06ae733fc57b48491a8029b8c2
+
+# Mass converting string literals to use double quotes.
+2a34dc9e8470285b0ed2db71109ef4265e29688b
+bfcae349b88fd959e32bfacd027a5be976fe2132
+01a819a42daa7990c30ab9776208b3dcb9f3a28b

.gitattributes

@@ -1,3 +1,33 @@
-tests/** export-ignore
-tests/ export-ignore
-chart/tests 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
+chart/charts/** export-ignore
+
+Dockerfile.ci export-ignore
+
+ISSUE_TRIAGE_PROCESS.rst export-ignore
+CONTRIBUTING.rst export-ignore
+contributing_docs/ export-ignore
+
+.devcontainer export-ignore
+.github export-ignore
+.readthedocs.yml export-ignore
+.hadolint.yaml export-ignore
+.pre-commit-config.yaml export-ignore
+.mailmap export-ignore
+.editorconfig 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