Fellow Airflowers, as agreed in the Airflow 3 dev call, we have branched off for the Airflow 2.10.0 release, and now Airflow's main branch is Airflow 3!
Airflow 2.10.0rc1 will be created in a few hours from v2-10-stable branch. If rc1 does not succeed and if we need to create rc2, the bugfixes should be created to v2-10-test & main branch both if there are merge conflicts. If there aren’t merge conflicts, feel free to target either branch & the release manager will take care of making sure that those are both in main and 2.10.0 – but please notify the release manager. After the Airflow 2.10.0 release, PRs targeting Airflow 2 and not Airflow 3 should be made against v2-10-test (e.g. code to integrate Fab). For Contributors: All bug fixes after 2.10.0 release will target Airflow 3. We will make the best effort to make them available in 2.10.x, but if somebody wants to guarantee that a fix is included in 2.10.x, they need to raise the PR explicitly to the v2-10-test branch too. For Committers: When merging bugfix PRs to the main branch, the committers should also try to cherry-pick it to v2-10-test branch. If there are merge conflicts, the committer should add a comment on the original PR, informing the author and asking them to raise a separate PR against v2-10-test branch. If this doesn't happen, there is no guarantee that the PR will be part of 2.10. We will do a POC separately to evaluate cherrypicker [1] to make this process easier in the coming weeks and report back. All of the above has also been included in our Contributing Guide in this PR [2]. Start merging those Airflow 3 PRs now! :) [1]: https://pypi.org/project/cherry_picker/ [2]: https://github.com/apache/airflow/pull/41354 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@airflow.apache.org For additional commands, e-mail: dev-h...@airflow.apache.org
