Skip to content

Upgrade FAB to 4.1.3 (#24884)#25050

Closed
potiuk wants to merge 1 commit intoapache:v2-3-testfrom
potiuk:upgrade-to-latest-fab
Closed

Upgrade FAB to 4.1.3 (#24884)#25050
potiuk wants to merge 1 commit intoapache:v2-3-testfrom
potiuk:upgrade-to-latest-fab

Conversation

@potiuk
Copy link
Member

@potiuk potiuk commented Jul 14, 2022

no relevant changes found when comparing airflow/www/fab_security with FAB
see dpgaspar/Flask-AppBuilder@v4.1.2...v4.1.3

(cherry picked from commit 01a5d8f)


^ 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 newsfragments.

@potiuk
Copy link
Member Author

potiuk commented Jul 14, 2022

I need to upgraed FAB in v2-3-stable so that pull requests of users can be made.

@potiuk
Copy link
Member Author

potiuk commented Jul 14, 2022

We need #25056 merged for this one to succed as well as # #25053

@jedcunningham
Copy link
Member

Why aren't we just cherry-picking #24884 into v2-3-test then?

@potiuk
Copy link
Member Author

potiuk commented Jul 14, 2022

I am testing PR from a fork to v2-3-stable - that's why :).

Root cause is that there is a change #24961 coming which is coming from a user as PR (it's not really cherry-pickable as there were more changes in ther original PR and this one just brings DebugExecutor to be the same as in main).

And I already found that I need to merge #25056 and #25053 to main to make PRs to v2-3-stable work with the new selective checks and Python based breeze (so far we just tested that cherry-picks work fine).

I can eventually cherry-pick that one of course to v2-3-test, but then we would have to merge v2-3-test back to v2-3-stable so that users could make PRs to v2-3-stable.

I thought that we only merge v2-3-stable and v2-3-test when we relase, so I thought that this PR should be merged to stable now (to enable other PRs from users), but I can cherry-pick and merge that one after I get a green PR here.

@potiuk
Copy link
Member Author

potiuk commented Jul 16, 2022

Hey @jedcunningham - was it good-enough explanation ? We need #25056 merged for this one to succed as well as # #25053. So I'd love to merge those to get this one merged.

@jedcunningham
Copy link
Member

Yep, makes sense. I'd personally prefer we cherry-pick and do an out-of-band v2-3-stable sync, but it ultimately doesn't really matter 🤷‍♂️.

@potiuk
Copy link
Member Author

potiuk commented Jul 19, 2022

Let's see if we this will work now :)

@potiuk potiuk force-pushed the upgrade-to-latest-fab branch from f32ae37 to d1a8514 Compare July 19, 2022 16:07
@potiuk
Copy link
Member Author

potiuk commented Jul 19, 2022

Yep, makes sense. I'd personally prefer we cherry-pick and do an out-of-band v2-3-stable sync, but it ultimately doesn't really matter man_shrugging.

We can stil do it. I just want to have this PR green (and test that it CAN be done) and I can cherry-pick it directly later and merge to v2-3-stable, no problem

@potiuk potiuk force-pushed the upgrade-to-latest-fab branch from d1a8514 to 89a193a Compare July 21, 2022 12:28
@potiuk potiuk requested a review from ashb as a code owner July 21, 2022 12:28
@potiuk
Copy link
Member Author

potiuk commented Jul 21, 2022

Hey @jedcunningham @ephraimbuddy - I cherry-picked a number of breeze/ci changes (As again it was easier than trying to fix the related CI "problems" where changes in "main" have to be synced with the brenanch. Once it is green I will make a sync v2-3-stable to v2-3-test and then this one might finally succeed (and then I can re-cherry-pick it anyway)

@potiuk potiuk force-pushed the upgrade-to-latest-fab branch 2 times, most recently from de87c41 to a1b4f08 Compare August 4, 2022 16:42
@potiuk potiuk requested a review from mik-laj as a code owner August 4, 2022 19:36
@potiuk potiuk force-pushed the upgrade-to-latest-fab branch 2 times, most recently from 939b372 to 5d5f167 Compare August 4, 2022 20:17
no relevant changes found when comparing `airflow/www/fab_security` with FAB
see dpgaspar/Flask-AppBuilder@v4.1.2...v4.1.3

(cherry picked from commit 01a5d8f)
@potiuk potiuk force-pushed the upgrade-to-latest-fab branch from 5d5f167 to 2123b37 Compare August 5, 2022 12:53
@potiuk
Copy link
Member Author

potiuk commented Aug 5, 2022

OK. Finally I got it succeed, so I close this one and cherry-pick it instead :). We should be ok with handling PRs to v2-3 and v2-4 branches

@potiuk potiuk closed this Aug 5, 2022
@potiuk potiuk deleted the upgrade-to-latest-fab branch August 8, 2022 08:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants