Skip to content

Commit 38887f1

Browse files
authored
Merge branch 'main' into feat-58056-asset_and_time_schedule
2 parents 0187034 + cec8ba6 commit 38887f1

2,236 files changed

Lines changed: 80906 additions & 27728 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ scripts export-ignore
1515
Dockerfile.ci export-ignore
1616
CONTRIBUTING.rst export-ignore
1717
ISSUE_TRIAGE_PROCESS.rst export-ignore
18+
.github/PULL_REQUEST_TEMPLATE.md export-ignore
1819

1920
.asf.yaml export-ignore
2021
.bash_completion export-ignore

.github/CODEOWNERS

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Core
2-
/airflow-core/src/airflow/executors/ @XD-DENG @ashb @o-nikolas @pierrejeambrun @hussein-awala
2+
/airflow-core/src/airflow/executors/ @XD-DENG @ashb @o-nikolas @pierrejeambrun @hussein-awala @dheerajturaga
33
/airflow-core/src/airflow/jobs/ @ashb @XD-DENG
44
/airflow-core/src/airflow/models/ @XD-DENG @ashb
55

@@ -9,18 +9,15 @@
99
# DAG Parsing
1010
/airflow-core/src/airflow/dag_processing @jedcunningham @ephraimbuddy
1111

12-
# Kubernetes
13-
/providers/cncf/kubernetes/ @dstandish @jedcunningham
14-
1512
# Helm Chart
16-
/chart/ @jedcunningham @hussein-awala @jscheffl
13+
/chart/ @jedcunningham @hussein-awala @jscheffl @bugraoz93
1714

1815
# Docs
1916
/docs/*.py @potiuk @ashb @gopidesupavan @amoghrajesh @jscheffl @bugraoz93 @kaxil @jason810496
2017

2118
# API
2219
/airflow-core/src/airflow/api/ @ephraimbuddy @pierrejeambrun @rawwar @jason810496
23-
/airflow-core/src/airflow/api_fastapi/ @ephraimbuddy @pierrejeambrun @rawwar @jason810496 @bugraoz93 @shubhamraj-git
20+
/airflow-core/src/airflow/api_fastapi/ @ephraimbuddy @pierrejeambrun @rawwar @jason810496 @bugraoz93 @shubhamraj-git @choo121600
2421
/airflow-core/src/airflow/api_fastapi/execution_api/ @ashb @kaxil @amoghrajesh
2522

2623
# Airflow CTL
@@ -33,16 +30,16 @@
3330
/airflow-core/src/airflow/api_fastapi/auth/ @vincbeck
3431

3532
# UI
36-
/airflow-core/src/airflow/ui/ @bbovenzi @pierrejeambrun @ryanahamilton @shubhamraj-git @guan404ming @vatsrahul1001
33+
/airflow-core/src/airflow/ui/ @bbovenzi @pierrejeambrun @ryanahamilton @shubhamraj-git @guan404ming @vatsrahul1001 @choo121600
3734

3835
# UI e2e tests
39-
/airflow-core/src/airflow/ui/tests/e2e/ @vatsrahul1001
36+
/airflow-core/src/airflow/ui/tests/e2e/ @vatsrahul1001 @choo121600
4037

4138
# Translation Owners (i18n)
4239
# Note: Non committer engaged translators are listed in comments prevent making file syntax invalid
4340
# See: https://github.com/apache/airflow/blob/main/airflow-core/src/airflow/ui/public/i18n/README.md#43-engaged-translator
4441
airflow-core/src/airflow/ui/public/i18n/locales/ar/ @shahar1 @hussein-awala # + @ahmadtfarhan
45-
airflow-core/src/airflow/ui/public/i18n/locales/ca/ @jscheffl @bugraoz93 # + @ecodina
42+
airflow-core/src/airflow/ui/public/i18n/locales/ca/ @jscheffl @bugraoz93 # + @ecodina @oscarhernandezrodriguez
4643
airflow-core/src/airflow/ui/public/i18n/locales/de/ @jscheffl # + @TJaniF @m1racoli
4744
airflow-core/src/airflow/ui/public/i18n/locales/el/ @ashb # + @PApostol @xBis7
4845
airflow-core/src/airflow/ui/public/i18n/locales/es/ @bbovenzi # + @aoelvp94
@@ -51,8 +48,8 @@ airflow-core/src/airflow/ui/public/i18n/locales/he/ @shahar1 @romsharon98 # +@De
5148
airflow-core/src/airflow/ui/public/i18n/locales/hi/ @vatsrahul1001
5249
airflow-core/src/airflow/ui/public/i18n/locales/hu/ @jscheffl @potiuk # +@majorosdonat
5350
airflow-core/src/airflow/ui/public/i18n/locales/it/ @bbovenzi # + @aoelvp94
54-
airflow-core/src/airflow/ui/public/i18n/locales/ja/ @uranusjr @sekikn # + @rsanda
55-
airflow-core/src/airflow/ui/public/i18n/locales/ko/ @jscheffl @potiuk # + @choo121600 @kgw7401 @onestn @noeunkim
51+
airflow-core/src/airflow/ui/public/i18n/locales/ja/ @uranusjr @sekikn # + @rsanda
52+
airflow-core/src/airflow/ui/public/i18n/locales/ko/ @choo121600 # + @kgw7401 @onestn @noeunkim
5653
airflow-core/src/airflow/ui/public/i18n/locales/nl/ @BasPH # + @DjVinnii
5754
airflow-core/src/airflow/ui/public/i18n/locales/pl/ @potiuk @mobuchowski # + @kacpermuda
5855
airflow-core/src/airflow/ui/public/i18n/locales/pt/ @potiuk # + @aoelvp94 @victoru2
@@ -87,18 +84,20 @@ airflow-core/src/airflow/ui/public/i18n/locales/zh-TW/ @Lee-W @jason810496 @guan
8784

8885
# Providers
8986
/providers/amazon/ @o-nikolas
90-
/providers/celery/ @hussein-awala
91-
/providers/cncf/kubernetes @jedcunningham @hussein-awala
87+
/providers/apache/iceberg/ @Fokko
88+
/providers/celery/ @hussein-awala @dheerajturaga
89+
/providers/cncf/kubernetes @jedcunningham @hussein-awala @jscheffl
9290
/providers/common/messaging/ @vincbeck
9391
/providers/dbt/cloud/ @josh-fell
94-
/providers/edge3/ @jscheffl
92+
/providers/edge3/ @jscheffl @dheerajturaga
9593
/providers/fab/ @vincbeck
94+
/providers/google/ @shahar1
9695
/providers/hashicorp/ @hussein-awala
9796
/providers/keycloak/ @vincbeck @bugraoz93
97+
/providers/microsoft/azure/ @dabla
9898
/providers/openlineage/ @mobuchowski
9999
/providers/smtp/ @hussein-awala
100100
/providers/snowflake/ @potiuk
101-
/providers/apache/iceberg/ @Fokko
102101

103102
# Dev tools
104103
/.github/workflows/ @potiuk @ashb @gopidesupavan @amoghrajesh @jscheffl @bugraoz93 @kaxil @jason810496
@@ -115,10 +114,10 @@ Dockerfile.ci @potiuk @ashb @gopidesupavan @amoghrajesh @jscheffl @bugraoz93 @ka
115114
/airflow-e2e-tests/ @potiuk @ashb @gopidesupavan @amoghrajesh @jscheffl @bugraoz93 @kaxil @jason810496
116115

117116
# Task SDK integration tests
118-
/task-sdk-integration-tests/ @potiuk @ashb @gopidesupavan @amoghrajesh @jscheffl @bugraoz93 @kaxil @jason810496
117+
/task-sdk-integration-tests/ @potiuk @ashb @gopidesupavan @amoghrajesh @bugraoz93 @kaxil @jason810496
119118

120119
# airflowctl integration tests
121-
/airflow-ctl-tests/ @potiuk @ashb @gopidesupavan @amoghrajesh @jscheffl @bugraoz93 @kaxil @jason810496
120+
/airflow-ctl-tests/ @potiuk @ashb @gopidesupavan @amoghrajesh @bugraoz93 @kaxil @jason810496
122121

123122
# Issue triage process
124123
# ISSUE_TRIAGE_PROCESS.rst

.github/ISSUE_TEMPLATE/1-airflow_bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ body:
3838
for more information.
3939
multiple: false
4040
options:
41-
- "3.1.5"
41+
- "3.1.6"
4242
- "2.11.X"
4343
- "main (development)"
4444
- "Other Airflow 3 version (please specify below)"

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,39 @@
11
<!--
2-
Licensed to the Apache Software Foundation (ASF) under one
3-
or more contributor license agreements. See the NOTICE file
4-
distributed with this work for additional information
5-
regarding copyright ownership. The ASF licenses this file
6-
to you under the Apache License, Version 2.0 (the
7-
"License"); you may not use this file except in compliance
8-
with the License. You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing,
13-
software distributed under the License is distributed on an
14-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
KIND, either express or implied. See the License for the
16-
specific language governing permissions and limitations
17-
under the License.
18-
-->
2+
Thank you for contributing!
193
20-
<!--
21-
Thank you for contributing! Please make sure that your code changes
22-
are covered with tests. And in case of new features or big changes
23-
remember to adjust the documentation.
4+
Please provide above a brief description of the changes made in this pull request.
5+
Write a good git commit message following this guide: http://chris.beams.io/posts/git-commit/
6+
7+
Please make sure that your code changes are covered with tests.
8+
And in case of new features or big changes remember to adjust the documentation.
249
25-
Feel free to ping committers for the review!
10+
Feel free to ping (in general) for the review if you do not see reaction for a few days
11+
(72 Hours is the minimum reaction time you can expect from volunteers) - we sometimes miss notifications.
2612
2713
In case of an existing issue, reference it using one of the following:
2814
29-
closes: #ISSUE
30-
related: #ISSUE
15+
* closes: #ISSUE
16+
* related: #ISSUE
17+
-->
18+
19+
---
20+
21+
##### Was generative AI tooling used to co-author this PR?
3122

32-
How to write a good git commit message:
33-
http://chris.beams.io/posts/git-commit/
23+
<!--
24+
If generative AI tooling has been used in the process of authoring this PR, please
25+
change below checkbox to `[X]` followed by the name of the tool, uncomment the "Generated-by".
3426
-->
3527

28+
- [ ] Yes (please specify the tool below)
3629

30+
<!--
31+
Generated-by: [Tool Name] following [the guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#gen-ai-assisted-contributions)
32+
-->
3733

38-
<!-- Please keep an empty line above the dashes. -->
3934
---
40-
**^ Add meaningful description above**
41-
Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#pull-request-guidelines)** for more information.
42-
In case of fundamental code changes, an Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals)) is needed.
43-
In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
44-
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).
35+
36+
* 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.
37+
* For fundamental code changes, an Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals)) is needed.
38+
* When adding dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
39+
* 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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ inputs:
2424
default: "3.10"
2525
uv-version:
2626
description: 'uv version to use'
27-
default: "0.9.21" # Keep this comment to allow automatic replacement of uv version
27+
default: "0.9.29" # Keep this comment to allow automatic replacement of uv version
2828
outputs:
2929
host-python-version:
3030
description: Python version used in host
@@ -33,7 +33,7 @@ runs:
3333
using: "composite"
3434
steps:
3535
- name: "Setup python"
36-
uses: actions/setup-python@v5
36+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
3737
with:
3838
python-version: ${{ inputs.python-version }}
3939
- name: "Install uv"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ inputs:
2424
default: "3.10"
2525
uv-version:
2626
description: 'uv version to use'
27-
default: "0.9.21" # Keep this comment to allow automatic replacement of uv version
27+
default: "0.9.29" # Keep this comment to allow automatic replacement of uv version
2828
prek-version:
2929
description: 'prek version to use'
30-
default: "0.2.25" # Keep this comment to allow automatic replacement of prek version
30+
default: "0.3.1" # Keep this comment to allow automatic replacement of prek version
3131
save-cache:
3232
description: "Whether to save prek cache"
3333
required: true

.github/actions/post_tests_failure/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@ runs:
2222
using: "composite"
2323
steps:
2424
- name: "Upload airflow logs"
25-
uses: actions/upload-artifact@v4
25+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
2626
with:
2727
name: airflow-logs-${{env.JOB_ID}}
2828
path: './files/airflow_logs*'
2929
retention-days: 7
3030
if-no-files-found: ignore
3131
- name: "Upload container logs"
32-
uses: actions/upload-artifact@v4
32+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
3333
with:
3434
name: container-logs-${{env.JOB_ID}}
3535
path: "./files/container_logs*"
3636
retention-days: 7
3737
if-no-files-found: ignore
3838
- name: "Upload other logs"
39-
uses: actions/upload-artifact@v4
39+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
4040
with:
4141
name: container-logs-${{env.JOB_ID}}
4242
path: "./files/other_logs*"

.github/actions/post_tests_success/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ runs:
3131
using: "composite"
3232
steps:
3333
- name: "Upload artifact for warnings"
34-
uses: actions/upload-artifact@v4
34+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
3535
with:
3636
name: test-warnings-${{ env.JOB_ID }}
3737
path: ./files/warnings-*.txt

.github/boring-cyborg.yml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,13 @@ labelPRBasedOnFilePath:
311311

312312
area:API:
313313
- airflow-core/src/airflow/api/**/*
314-
- airflow-core/src/airflow/api_fastapi/**/*
314+
- airflow-core/src/airflow/api_fastapi/auth/**/*
315+
- airflow-core/src/airflow/api_fastapi/common/**/*
316+
- airflow-core/src/airflow/api_fastapi/core_api/**/*
317+
- airflow-core/src/airflow/api_fastapi/logging/**/*
318+
- airflow-core/src/airflow/api_fastapi/app.py
319+
- airflow-core/src/airflow/api_fastapi/compat.py
320+
- airflow-core/src/airflow/api_fastapi/main.py
315321
- clients/**/*
316322
- airflow-core/docs/stable-rest-api-ref.rst
317323
- airflow-core/tests/unit/api_fastapi/**/*
@@ -436,8 +442,8 @@ labelPRBasedOnFilePath:
436442
- airflow-core/docs/howto/usage-cli.rst
437443

438444
area:Lineage:
439-
- airflow-core/src/airflow/lineage/**/*
440-
- airflow-core/tests/unit/lineage/**/*
445+
- task-sdk/src/airflow/sdk/lineage.py
446+
- task-sdk/tests/task_sdk/test_lineage.py
441447
- airflow-core/docs/administration-and-deployment/lineage.rst
442448

443449
area:Logging:
@@ -513,6 +519,7 @@ labelPRBasedOnFilePath:
513519
- airflow-core/tests/system/**/*
514520

515521
area:task-sdk:
522+
- airflow-core/src/airflow/api_fastapi/execution_api/**/*
516523
- task-sdk/**/*
517524

518525
area:go-sdk:
@@ -521,6 +528,18 @@ labelPRBasedOnFilePath:
521528
area:db-migrations:
522529
- airflow-core/src/airflow/migrations/versions/*
523530

531+
area:deadline-alerts:
532+
- airflow-core/src/airflow/models/deadline.py
533+
- airflow-core/src/airflow/models/deadline_alert.py
534+
- airflow-core/src/airflow/serialization/definitions/deadline.py
535+
- airflow-core/src/airflow/migrations/versions/*deadline*.py
536+
- task-sdk/src/airflow/sdk/definitions/deadline.py
537+
- airflow-core/tests/unit/models/test_deadline.py
538+
- airflow-core/tests/unit/models/test_deadline_alert.py
539+
- task-sdk/tests/task_sdk/definitions/test_deadline.py
540+
- airflow-core/docs/howto/deadline-alerts.rst
541+
- airflow-core/docs/howto/sla-to-deadlines.rst
542+
524543
area:providers:
525544
- providers/**/*
526545

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
USE_LOCAL_HATCH: "${{ inputs.use-local-venv }}"
114114
run: |
115115
uv tool uninstall hatch || true
116-
uv tool install hatch==1.16.2
116+
uv tool install hatch==1.16.3
117117
breeze release-management "${DISTRIBUTION_TYPE}" --distribution-format wheel
118118
if: ${{ matrix.python-version == inputs.default-python-version }}
119119
- name: "Verify wheel packages with twine"

0 commit comments

Comments
 (0)