Skip to content
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

Update superset changes from latest upstream release #250

Closed
carlosms opened this issue Aug 13, 2019 · 2 comments · Fixed by #265
Closed

Update superset changes from latest upstream release #250

carlosms opened this issue Aug 13, 2019 · 2 comments · Fixed by #265
Assignees
@smacker

Comments

@carlosms
Copy link
Contributor

No description provided.

@smacker
Copy link
Contributor

smacker commented Aug 19, 2019

Merging upstream isn't straight forward because upstream releases have cherry-picked commits, so the history isn't linear.

Instruction for merge written a while ago: https://gist.github.com/smacker/b8a6ccf5539ad2a209c97fe878233ac7

Superset internals were refactored in the new release so for cancelation feature it would be easy to revert current changes and apply patch from here: apache/superset#7611

@smacker
Copy link
Contributor

smacker commented Aug 19, 2019

Another pain point is a migration that exists only in our fork. It would break the order of migrations in upstream and db upgrade would fail. Most probably the best solution is to introduce yet another migration that would merge our current head with what has changed in upstream. See 5c76216 as example.

@smacker smacker self-assigned this Aug 20, 2019
@smacker smacker mentioned this issue Aug 22, 2019
Merged
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@smacker smacker

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Update superset to v0.34.0rc1
2 participants
@smacker @carlosms