jscheffl commented on code in PR #41457: URL: https://github.com/apache/airflow/pull/41457#discussion_r1727139040
########## dev/README_AIRFLOW3_DEV.md: ########## @@ -0,0 +1,152 @@ +<!-- + 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. +--> +<!-- START doctoc generated TOC please keep comment here to allow auto update --> +<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE --> +**Table of contents** + +- [Main branch is Airflow 3](#main-branch-is-airflow-3) +- [Contributors](#contributors) + - [Developing for providers and Helm chart](#developing-for-providers-and-helm-chart) + - [Developing for Airflow 3 and 2.10.x / 2.11.x](#developing-for-airflow-3-and-210x--211x) + - [Developing for Airflow 3](#developing-for-airflow-3) + - [Developing for Airflow 2.10.x](#developing-for-airflow-210x) + - [Developing for Airflow 2.11](#developing-for-airflow-211) +- [Committers / PMCs](#committers--pmcs) + - [Merging PRs for providers and Helm chart](#merging-prs-for-providers-and-helm-chart) + - [Merging PR for Airflow 3 and 2.10.x / 2.11.x](#merging-pr-for-airflow-3-and-210x--211x) + - [Merging PRs 2.10.x](#merging-prs-210x) + - [Merging PRs for Airflow 3](#merging-prs-for-airflow-3) + - [Merging PRs for Airflow 2.11](#merging-prs-for-airflow-211) +- [Milestones for PR](#milestones-for-pr) + - [Set 2.10.x milestone](#set-210x-milestone) + - [Set 2.11 milestone](#set-211-milestone) + - [Set 3 milestone](#set-3-milestone) + +<!-- END doctoc generated TOC please keep comment here to allow auto update --> + +# Main branch is Airflow 3 + +The main branch is for development of Airflow 3. +Airflow 2.10.x releases will be cut from `v2-10-stable` branch. + +# Contributors + +The following section explains which branches you should target your PR to + +## Developing for providers and Helm chart + +PRs should target `main` branch. +Make sure your code is only about Providers or Helm chart. +Avoid mixing core changes into the same PR + +## Developing for Airflow 3 and 2.10.x / 2.11.x + +If the PR is relevant for both Airflow 3 and 2 it should target `main` branch. + +Note: The mental model of Airflow 2.11 is bridge release for Airflow 3. +As a result, Airflow 2.11 is not planned to introduce new features other than ones relevant as bridge release for Airflow 3. +That said, we recognize that there may be exceptions. +If you believe a specific feature is must have for Airflow 2.11 you need to raise this as discussion thread in the mailing list. +Points to address to make your case: + +1. You must clarify what is the urgency (why it can't wait for Airflow 3) +2. You need be willing to deliver the feature for both main branch and Airflow 2.11 branch +3. You must be willing to provide support future bug fixes as needed. + +Points to consider on how PMC members evaluate the request of exception: + +1. Feature impact. Is it really urgent? How many are affected? +2. Are there any workarounds? +3. Scope of change. Both in code lines / number of files and components changed. +4. Is the feature at the heart of Airflow (scheduler, dag parser) or peripheral. +5. Identity of the requester. Is the request from/supported by a member of the community? +6. Similar previous cases approved. +7. Other considerations that may raise by PMC members depending on the case. + +## Developing for Airflow 3 + +PRs should target `main` branch. + +## Developing for Airflow 2.10.x + +PR should target `v2-10-test` branch. When cutting a new release for 2.10 release manager +will sync `v2-10-test` branch to `v2-10-stable` and cut the release from the stable branch. +PR should never target `v2-10-stable` unless specifically instructed by release manager. + +## Developing for Airflow 2.11 + +Version 2.11 is planned to be cut from `v2-10-stable` branch. Review Comment: To we need to put PRs for 2.11 "on hold" so that they are not mixed-up with other patches while we are maintaining 2.10 (and not ready for all stuff being ready in 2.11)? -- 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: commits-unsubscr...@airflow.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
