Dev-iL commented on code in PR #64463: URL: https://github.com/apache/airflow/pull/64463#discussion_r3009442919
########## dev/README_AIRFLOW3_DEV.md: ########## @@ -76,13 +78,70 @@ PRs should target `main` branch. ## Developing for Airflow 2.11.x -If a PR can be cleanly cherry-picked from `main` to `v2-11-test`, it should target the `main` branch and include the `backport-to-v2-11-test` label to automate the backport. -If the PR cannot be cherry-picked without conflicts, you must manually create a PR targeting the `v2-11-test` branch. - > [!IMPORTANT] -> Airflow 2.11 is intended as a bridge release for Airflow 3. -> As such, it is not expected to introduce new features beyond those relevant to the transition to Airflow 3. -> That said, we focus only critical security fixes in the maintenance period until end-of-life. +> Airflow 2.11 is intended as a bridge release for Airflow 3 and reaches **end-of-life on April 22, +> 2026**. There will likely be just one last **2.11.3** release before EOL — there are already some +> bug fixes targeting 2.11 and one final update of dependencies will be done before we reach EOL. +> We focus only on critical bug fixes and security fixes in this maintenance period. + +### Core and FAB provider changes + +The `v2-11-test` branch has diverged significantly from `main` (Airflow 3.x) — both for core +Airflow and for the FAB provider. Cherry-picks rarely apply cleanly, so **if an issue affects both +Airflow 2.11 and Airflow 3, you need to create two separate PRs** — one targeting `main` and one +targeting `v2-11-test`: + +1. **If the bug is reproducible on both `main` and 2.11:** fix it on `main` first, then create a + separate PR targeting `v2-11-test` with the equivalent fix. +2. **If the bug is only reproducible on 2.11.x (not on `main`):** create a PR targeting `v2-11-test` + directly. +3. **If a cherry-pick happens to apply cleanly:** you may target `main` and add the + `backport-to-v2-11-test` label to automate the backport, but this is rare for core changes. + +**Special exception — FAB provider (apache-airflow-providers-fab 1.5.x):** + +The FAB provider is a special case. The FAB provider version on `main` (2.x+) has +`min-airflow-version` of Airflow 3 and uses FastAPI, while the older FAB provider 1.5.x for +Airflow 2.11 still uses Connexion — the code is heavily different between the two versions. +The FAB provider 1.5.x is maintained directly in the `v2-11-test` branch, which makes it easier +to test any changes for the Airflow 2.11 + FAB 1.5 combination together. Review Comment: (assuming this is true) is it worth mentioning that while AF2.11 will reach EOL soon, the same is not true for FAB provider 1.x, which may receive additional bugfix/security updates? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
