Sync v3-1-stable with v3-1-test to release 3.1.7rc1

.gitattributes

@@ -15,6 +15,7 @@ scripts export-ignore
 Dockerfile.ci export-ignore
 CONTRIBUTING.rst export-ignore
 ISSUE_TRIAGE_PROCESS.rst export-ignore
+.github/PULL_REQUEST_TEMPLATE.md export-ignore
 
 .asf.yaml export-ignore
 .bash_completion export-ignore

.github/CODEOWNERS

@@ -1,5 +1,5 @@
 # Core
-/airflow-core/src/airflow/executors/ @XD-DENG @ashb @o-nikolas @pierrejeambrun @hussein-awala
+/airflow-core/src/airflow/executors/ @XD-DENG @ashb @o-nikolas @pierrejeambrun @hussein-awala @dheerajturaga
 /airflow-core/src/airflow/jobs/ @ashb @XD-DENG
 /airflow-core/src/airflow/models/ @XD-DENG @ashb
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,44 +1,39 @@
 <!--
- 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!
 
-<!--
-Thank you for contributing! Please make sure that your code changes
-are covered with tests. And in case of new features or big changes
-remember to adjust the documentation.
+Please provide above a brief description of the changes made in this pull request.
+Write a good git commit message following this guide: http://chris.beams.io/posts/git-commit/
+
+Please make sure that your code changes are covered with tests.
+And in case of new features or big changes remember to adjust the documentation.
 
-Feel free to ping committers for the review!
+Feel free to ping (in general) for the review if you do not see reaction for a few days
+(72 Hours is the minimum reaction time you can expect from volunteers) - we sometimes miss notifications.
 
 In case of an existing issue, reference it using one of the following:
 
-closes: #ISSUE
-related: #ISSUE
+* closes: #ISSUE
+* related: #ISSUE
+-->
+
+---
+
+##### Was generative AI tooling used to co-author this PR?
 
-How to write a good git commit message:
-http://chris.beams.io/posts/git-commit/
+<!--
+If generative AI tooling has been used in the process of authoring this PR, please
+change below checkbox to `[X]` followed by the name of the tool, uncomment the "Generated-by".
 -->
 
+- [ ] Yes (please specify the tool below)
 
+<!--
+Generated-by: [Tool Name] following [the guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#gen-ai-assisted-contributions)
+-->
 
-<!-- Please keep an empty line above the dashes. -->
 ---
-**^ Add meaningful description above**
-Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#pull-request-guidelines)** for more information.
-In case of fundamental code changes, an Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals)) is needed.
-In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
-In case of backwards incompatible changes please leave a note in a newsfragment file, named `{pr_number}.significant.rst` or `{issue_number}.significant.rst`, in [airflow-core/newsfragments](https://github.com/apache/airflow/tree/main/airflow-core/newsfragments).
+
+* Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#pull-request-guidelines)** for more information. Note: commit author/co-author name and email in commits become permanently public when merged.
+* For fundamental code changes, an Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals)) is needed.
+* When adding dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
+* For significant user-facing changes create newsfragment: `{pr_number}.significant.rst` or `{issue_number}.significant.rst`, in [airflow-core/newsfragments](https://github.com/apache/airflow/tree/main/airflow-core/newsfragments).

.github/actions/breeze/action.yml

@@ -24,7 +24,7 @@ inputs:
     default: "3.10"
   uv-version:
     description: 'uv version to use'
-    default: "0.9.22"  # Keep this comment to allow automatic replacement of uv version
+    default: "0.9.26"  # Keep this comment to allow automatic replacement of uv version
 outputs:
   host-python-version:
     description: Python version used in host
@@ -33,7 +33,7 @@ runs:
   using: "composite"
   steps:
     - name: "Setup python"
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065  # v5.6.0
       with:
         python-version: ${{ inputs.python-version }}
     - name: "Install uv"

.github/actions/install-prek/action.yml

@@ -24,10 +24,10 @@ inputs:
     default: "3.10"
   uv-version:
     description: 'uv version to use'
-    default: "0.9.22"  # Keep this comment to allow automatic replacement of uv version
+    default: "0.9.26"  # Keep this comment to allow automatic replacement of uv version
   prek-version:
     description: 'prek version to use'
-    default: "0.2.25"  # Keep this comment to allow automatic replacement of prek version
+    default: "0.3.0"  # Keep this comment to allow automatic replacement of prek version
   save-cache:
     description: "Whether to save prek cache"
     required: true

.github/actions/post_tests_failure/action.yml

@@ -22,21 +22,21 @@ runs:
   using: "composite"
   steps:
     - name: "Upload airflow logs"
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2
       with:
         name: airflow-logs-${{env.JOB_ID}}
         path: './files/airflow_logs*'
         retention-days: 7
         if-no-files-found: ignore
     - name: "Upload container logs"
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2
       with:
         name: container-logs-${{env.JOB_ID}}
         path: "./files/container_logs*"
         retention-days: 7
         if-no-files-found: ignore
     - name: "Upload other logs"
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2
       with:
         name: container-logs-${{env.JOB_ID}}
         path: "./files/other_logs*"

.github/actions/post_tests_success/action.yml

@@ -31,7 +31,7 @@ runs:
   using: "composite"
   steps:
     - name: "Upload artifact for warnings"
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2
       with:
         name: test-warnings-${{ env.JOB_ID }}
         path: ./files/warnings-*.txt

.github/workflows/airflow-distributions-tests.yml

@@ -113,7 +113,7 @@ jobs:
           USE_LOCAL_HATCH: "${{ inputs.use-local-venv }}"
         run: |
           uv tool uninstall hatch || true
-          uv tool install hatch==1.16.2
+          uv tool install hatch==1.16.3
           breeze release-management "${DISTRIBUTION_TYPE}" --distribution-format wheel
         if: ${{ matrix.python-version == inputs.default-python-version }}
       - name: "Verify wheel packages with twine"

.github/workflows/basic-tests.yml

@@ -66,7 +66,7 @@ on:  # yamllint disable-line rule:truthy
         type: string
       uv-version:
         description: 'uv version to use'
-        default: "0.9.22"  # Keep this comment to allow automatic replacement of uv version
+        default: "0.9.26"  # Keep this comment to allow automatic replacement of uv version
         type: string
       platform:
         description: 'Platform for the build - linux/amd64 or linux/arm64'
@@ -272,11 +272,7 @@ jobs:
           platform: ${{ inputs.platform }}
           save-cache: false
       - name: "Autoupdate all prek hooks"
-        run: prek auto-update --cooldown-days 4 --freeze
-      - name: "Autoupdate Lucas-C hooks to bleeding edge"
-        run: prek auto-update --bleeding-edge --freeze --repo https://github.com/Lucas-C/pre-commit-hooks
-      - name: "Autoupdate Octopin to bleeding edge"
-        run: prek auto-update --bleeding-edge --freeze --repo https://github.com/eclipse-csi/octopin
+        run: prek autoupdate --cooldown-days 4 --freeze
       - name: "Check if there are any changes in prek hooks"
         run: |
           if ! git diff --exit-code; then
@@ -366,7 +362,7 @@ jobs:
           --task-sdk-version 1.0.0rc1 --sync-branch v3-1-test --answer yes --dry-run
       - name: "Check Airflow release process command"
         run: >
-          breeze release-management start-release --version 3.1.1
+          breeze release-management start-release --version 3.1.6
           --answer yes --dry-run
       - name: "Test providers metadata generation"
         run: |

.github/workflows/release_dockerhub_image.yml

@@ -58,7 +58,7 @@ jobs:
       AIRFLOW_VERSION: ${{ github.event.inputs.airflowVersion }}
       AMD_ONLY: ${{ github.event.inputs.amdOnly }}
       LIMIT_PYTHON_VERSIONS: ${{ github.event.inputs.limitPythonVersions }}
-      UV_VERSION: "0.9.22"  # Keep this comment to allow automatic replacement of uv version
+      UV_VERSION: "0.9.26"  # Keep this comment to allow automatic replacement of uv version
     if: contains(fromJSON('[
       "ashb",
       "bugraoz93",

.pre-commit-config.yaml

@@ -31,8 +31,7 @@ repos:
       - id: check-hooks-apply
         name: Check if all hooks apply to the repository
   - repo: https://github.com/eclipse-csi/octopin
-    # We need this commit because if supports two spaces before comments (yamllint compatibility)
-    rev: 74fd075c7b326c771cd95ca86c59cbe65f0dda37
+    rev: 67eac129b3e1d8ddb47e657bb2fda28c33d948ca  # frozen: v0.1.4
     hooks:
       - id: pin-versions
         name: Pin versions of dependencies in CI workflows (manual)
@@ -54,12 +53,14 @@ repos:
           ^docs/README\.md$|
           ^\.github/.*\.md$|
           ^airflow-core/tests/system/README\.md$
+        exclude:
+            (?x)
+            .github/PULL_REQUEST_TEMPLATE\.md$
         args:
           - "--maxlevel"
           - "2"
   - repo: https://github.com/Lucas-C/pre-commit-hooks
-    # replace hash with version once PR #103 merged comes in a release
-    rev: f5cfd5fdaf0211dfd1027d9d8442b764a232c7ad
+    rev: ad1b27d73581aa16cca06fc4a0761fc563ffe8e8  # frozen: v1.5.6
     hooks:
       - id: insert-license
         name: Add license for all SQL files
@@ -155,13 +156,15 @@ repos:
       - id: insert-license
         name: Add license for all Markdown files
         files: \.md$
-        exclude: PROVIDER_CHANGES.*\.md$
         args:
           - --comment-style
           - "<!--|| -->"
           - --license-filepath
           - scripts/ci/license-templates/LICENSE.txt
           - --fuzzy-match-generates-todo
+        exclude:
+          (?x)
+          .github/PULL_REQUEST_TEMPLATE\.md$
       - id: insert-license
         name: Add license for all other files
         exclude: ^\.github/.*$
@@ -180,6 +183,11 @@ repos:
         entry: ./scripts/ci/prek/check_min_python_version.py
         language: python
         require_serial: true
+      - id: check-notice-files
+        name: Check NOTICE files for current year and ASF references
+        entry: ./scripts/ci/prek/check_notice_files.py
+        language: python
+        files: ^.*NOTICE$
       - id: check-version-consistency
         name: Check version consistency
         entry: ./scripts/ci/prek/check_version_consistency.py
@@ -271,7 +279,7 @@ repos:
       - id: python-no-log-warn
         name: Check if there are no deprecate log warn
   - repo: https://github.com/adrienverge/yamllint
-    rev: 79a6b2b1392eaf49cdd32ac4f14be1a809bbd8f7  # frozen: v1.37.1
+    rev: cba56bcde1fdd01c1deb3f945e69764c291a6530  # frozen: v1.38.0
     hooks:
       - id: yamllint
         name: Check YAML files with yamllint
@@ -325,7 +333,7 @@ repos:
           - --skip=providers/.*/src/airflow/providers/*/*.rst,providers/*/docs/changelog.rst,docs/*/commits.rst,providers/*/docs/commits.rst,providers/*/*/docs/commits.rst,docs/apache-airflow/tutorial/pipeline_example.csv,*.min.js,*.lock,INTHEWILD.md,*.svg
           - --exclude-file=.codespellignorelines
   - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: ea18690d7f8e44203c9efd7bc6229447d02e3951  # frozen: v1.19.0
+    rev: b546b77c44c466a54a42af5499dcc0dcc1a3193f  # frozen: v1.22.0
     hooks:
       - id: zizmor
         name: Run zizmor to check for github workflow syntax errors
@@ -362,7 +370,7 @@ repos:
         types_or: [python, pyi]
         args: [--fix]
         require_serial: true
-        additional_dependencies: ['ruff==0.14.10']
+        additional_dependencies: ['ruff==0.14.14']
         exclude: ^airflow-core/tests/unit/dags/test_imports\.py$|^performance/tests/test_.*\.py$
       - id: ruff-format
         name: Run 'ruff format'
@@ -585,7 +593,6 @@ repos:
           ^docs/apache-airflow-providers-amazon/secrets-backends/aws-ssm-parameter-store\.rst$|
           git|
           ^helm-tests/tests/chart_utils/helm_template_generator\.py$|
-          ^helm-tests/tests/chart_utils/ingress-networking-v1beta1\.json$|
           package-lock\.json$|
           ^.*\.(png|gif|jp[e]?g|svg|tgz|lock)$|
           ^\.pre-commit-config\.yaml$|
@@ -1053,7 +1060,7 @@ repos:
         stages: ['manual']
         name: Run mypy for dev (manual)
         language: python
-        entry: ./scripts/ci/prek/mypy_folder.py dev
+        entry: ./scripts/ci/prek/mypy_folder.py dev scripts
         pass_filenames: false
         files: ^.*\.py$
         require_serial: true

COMMITTERS.rst

@@ -215,6 +215,12 @@ To be able to merge PRs, committers have to integrate their GitHub ID with Apach
     GitHub ID to your Apache account. You should see 5 green checks in GitBox.
 3.  Wait at least 30  minutes for an email inviting you to Apache GitHub Organization and accept invitation.
 4.  After accepting the GitHub Invitation verify that you are a member of the `Airflow committers team on GitHub <https://github.com/orgs/apache/teams/airflow-committers>`__.
+
+   Additionally, as a committer you can view the team membership at:
+
+   * https://github.com/orgs/apache/teams/airflow-committers/members
+   * https://whimsy.apache.org/roster/committee/airflow
+
 5.  Ask in ``#internal-airflow-ci-cd`` channel to be `configured in self-hosted runners <https://github.com/apache/airflow-ci-infra/blob/main/scripts/list_committers>`_
     by the CI team. Wait for confirmation that this is done and some helpful tips from the CI team (Temporarily disabled)
 6.  After confirming that step 5 is done, open a PR to include your GitHub ID in:

Dockerfile

@@ -56,7 +56,7 @@ ARG AIRFLOW_PYTHON_VERSION="3.12.12"
 # Also use `force pip` label on your PR to swap all places we use `uv` to `pip`
 ARG AIRFLOW_PIP_VERSION=25.3
 # ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
-ARG AIRFLOW_UV_VERSION=0.9.22
+ARG AIRFLOW_UV_VERSION=0.9.26
 ARG AIRFLOW_USE_UV="false"
 ARG UV_HTTP_TIMEOUT="300"
 ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow"
@@ -143,7 +143,6 @@ libev4 \
 libffi-dev \
 libgdbm-compat-dev \
 libgdbm-dev \
-libgdbm-dev \
 libgeos-dev \
 libkrb5-dev \
 libldap2-dev \

Dockerfile.ci

@@ -83,7 +83,6 @@ libev4 \
 libffi-dev \
 libgdbm-compat-dev \
 libgdbm-dev \
-libgdbm-dev \
 libgeos-dev \
 libkrb5-dev \
 libldap2-dev \
@@ -1586,7 +1585,7 @@ ARG HOME=/root
 ARG AIRFLOW_IMAGE_TYPE="ci"
 ARG AIRFLOW_HOME=/root/airflow
 ARG AIRFLOW_SOURCES=/opt/airflow
-ARG INSTALL_MYSQL_CLIENT_TYPE="mysql"
+ARG INSTALL_MYSQL_CLIENT_TYPE="mariadb"
 
 ENV HOME=${HOME} \
     AIRFLOW_IMAGE_TYPE=${AIRFLOW_IMAGE_TYPE} \
@@ -1619,7 +1618,7 @@ RUN SYSTEM=$(uname -s | tr '[:upper:]' '[:lower:]') \
     && chmod +x /usr/local/bin/helm
 
 # Install mprocs - a modern process manager for managing multiple Airflow components
-ARG MPROCS_VERSION="0.8.2"
+ARG MPROCS_VERSION="0.8.3"
 
 RUN SYSTEM=$(uname -s | tr '[:upper:]' '[:lower:]') \
     && PLATFORM="$(uname -m)" \
@@ -1710,8 +1709,8 @@ COPY --from=scripts common.sh install_packaging_tools.sh install_additional_depe
 # Also use `force pip` label on your PR to swap all places we use `uv` to `pip`
 ARG AIRFLOW_PIP_VERSION=25.3
 # ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
-ARG AIRFLOW_UV_VERSION=0.9.22
-ARG AIRFLOW_PREK_VERSION="0.2.25"
+ARG AIRFLOW_UV_VERSION=0.9.26
+ARG AIRFLOW_PREK_VERSION="0.3.0"
 
 # UV_LINK_MODE=copy is needed since we are using cache mounted from the host
 ENV AIRFLOW_PIP_VERSION=${AIRFLOW_PIP_VERSION} \

NOTICE

@@ -1,5 +1,5 @@
 Apache Airflow
-Copyright 2016-2025 The Apache Software Foundation
+Copyright 2016-2026 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).