Skip to content

Sync 3-0-test with 3.0.4 milestone PRs #54343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
amoghrajesh wants to merge 11 commits into from
Closed

Sync 3-0-test with 3.0.4 milestone PRs #54343

amoghrajesh wants to merge 11 commits into from

Conversation

@amoghrajesh
Copy link
Contributor

@amoghrajesh amoghrajesh commented Aug 11, 2025 •
edited by ashb
Loading

Two step process

Part 1

Marked for 3.0.4 but didn't make it and not moved to 3.0.5 (python ./dev/airflow-github compare 3.0.4 --previous-version 3.0.3 --show-commits)

Merged PRs (with CHERRY = No - not yet cherry-picked) between 3.0.3 and 3.0.4

  • 53814 - Fix custom xcom backend deserialize when BaseXCom.get_all is used - a8c4ba3
  • 53825 - Fix poolbar counts - e83ca8e
  • 50740 - Fix incorrect reference to SimpleHttpOperator in 3.0.0 release notes - 71f4224
  • 53475 - Use asyncio.run instead of loop.run_until_complete - 81ac72c
  • 53532 - Fixed Task group names duplication in Task's task_id for MappedOperator - 6b618ef
  • 53425 - Updating K8's supported versions in prerequisites.rst to match README.md - 2328461
  • 53473 - Update dag bundles docs; add s3, fix git classpath - bf5fd5f
  • 53460 - Fix broken link in advanced logging config docs - df5c949
  • 53331 - Add note about ruff rules and preview flag - d4d4cce
  • 52871 - Fix task configuration defaults for AbstractOperator - 04d2d3b
  • 52786 - Allow DEFAULT_QUEUE to be configurable from airflow settings in Task SDK - c65dc8e
  • 52797 - Fixing bad cadwyn migration for upstream map indexes - 2bb5d01

PRs with conflicts conflicts:

TODO: Part 2: Marked for 3.0.4, didnt make it, milestone is 3.0.5 (python ./dev/airflow-github compare 3.0.5 --previous-version 3.0.4 --show-commits)

Merged PRs (with CHERRY = No - not yet cherry-picked):

^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
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.

@dabla @amoghrajesh
Allow DEFAULT_QUEUE to be configurable from airflow settings in Tas…
a1d0c3b 
…k SDK (apache#52786)

Co-authored-by: David Blain <david.blain@b-holding.be>
(cherry picked from commit c65dc8e)
@amoghrajesh amoghrajesh changed the title Sync v3 for 3.0.4 Sync 3-0-test with 3.0.4 milestonePRs Aug 11, 2025
@amoghrajesh amoghrajesh changed the title Sync 3-0-test with 3.0.4 milestonePRs Sync 3-0-test with 3.0.4 milestone PRs Aug 11, 2025
potiuk
potiuk reviewed Aug 11, 2025
View reviewed changes
potiuk
potiuk reviewed Aug 11, 2025
View reviewed changes
@amoghrajesh
Copy link
Contributor Author

amoghrajesh commented Aug 11, 2025

@ashb @potiuk green finally!

amoghrajesh
amoghrajesh commented Aug 11, 2025
View reviewed changes
airflow-core/src/airflow/api_fastapi/execution_api/versions/v2025_08_10.py
from airflow.api_fastapi.execution_api.routes.xcoms import GetXComSliceFilterParams


class AddDagRunStateFieldAndPreviousEndpoint(VersionChange):
Copy link
Contributor Author

@amoghrajesh amoghrajesh Aug 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didnt add changes for #50825, it is a dependent change but for 3.1

Copy link
Member

@ashb ashb Aug 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I'm clear, you didn't add the rest of this PR, but you have included the Cadwyn migration?

Copy link
Contributor Author

@amoghrajesh amoghrajesh Aug 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, that PR is entirely excluded. The cadywn migration if from #53655

@ephraimbuddy
Copy link
Contributor

ephraimbuddy commented Aug 11, 2025 •
edited
Loading

I think we shouldn't merge this with squash and merge? Probably use command line ff

@ashb
Copy link
Member

ashb commented Aug 11, 2025

I think we shouldn't merge this with squash and merge? Probably use command line ff

Yes, exactly that @ephraimbuddy

@ashb
Copy link
Member

ashb commented Aug 11, 2025

5d3f4e5 has pulled in more in the tests than just the commit it is from

@ashb
Copy link
Member

ashb commented Aug 11, 2025

Ditto 977a190 -- can we merge that in to whatever other commit introduces the change.

Since we are doing manual cherry picks we ideally need each commit on this PR to be "standalone" as our usual squashing won't apply here.

kaxil and others added 5 commits August 11, 2025 19:45
@kaxil @amoghrajesh
Fix task configuration defaults for AbstractOperator (apache#52871)
743e6ac 
Some defaults weren't being taken from configuration -- this is now fixed.

(cherry picked from commit 04d2d3b)
@eladkal @amoghrajesh
Add note about ruff rules and preview flag (apache#53331)
ad87655 
(cherry picked from commit d4d4cce)
@r-richmond @amoghrajesh
Fix broken link in advanced logging config docs (apache#53460)
9fd6c3e 
(cherry picked from commit df5c949)
@jedcunningham @amoghrajesh
Update dag bundles docs; add s3, fix git classpath (apache#53473)
9e26810 
(cherry picked from commit bf5fd5f)
@evgenii-prusov @Lee-W @amoghrajesh
Fixed Task group names duplication in Task's task_id for MappedOperat…
63387be 
…or (apache#53532)

Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Co-authored-by: Evgenii Prusov <evgenii.prusov@daiichisankyo.com>
(cherry picked from commit 6b618ef)
@kaxil kaxil marked this pull request as draft August 11, 2025 14:36
@kaxil
Copy link
Member

kaxil commented Aug 11, 2025

Approved but converted to draft to avoid "accidental merge". Reminder, we will fast-forward the v3-0-test branch to preserve commits and not squash all commits in this PR into a single commit

@kaxil
Copy link
Member

kaxil commented Aug 11, 2025

https://github.com/apache/airflow/commits/v3-0-test/ is updated

@kaxil kaxil closed this Aug 11, 2025
@ashb ashb deleted the sync-v3-for-3.0.4 branch August 11, 2025 16:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@potiuk potiuk potiuk left review comments

@kaxil kaxil kaxil approved these changes

@ashb ashb Awaiting requested review from ashb ashb is a code owner

@jscheffl jscheffl Awaiting requested review from jscheffl jscheffl is a code owner

@uranusjr uranusjr Awaiting requested review from uranusjr uranusjr is a code owner

@XD-DENG XD-DENG Awaiting requested review from XD-DENG XD-DENG is a code owner

@mobuchowski mobuchowski Awaiting requested review from mobuchowski mobuchowski is a code owner

@dstandish dstandish Awaiting requested review from dstandish dstandish is a code owner

@hussein-awala hussein-awala Awaiting requested review from hussein-awala hussein-awala is a code owner

Assignees

No one assigned

Labels

area:providers area:serialization area:task-sdk kind:documentation provider:edge Edge Executor / Worker (AIP-69) / edge3

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.