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.

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

Move jupyter-apis (frontend) into StatCan/kubeflow jupyter-web-app #44

Closed
saffaalvi opened this issue Jan 29, 2021 · 1 comment
Closed

Comments

@saffaalvi
Copy link

In order to start pushing our new features (in both centraldashboard and jupyter-apis) upstream, we need to bring our jupyter-apis changes back into the kubeflow repo. Upstream has both jupyter-web-app and crud-web-apps/jupyter so will likely have to update both of those with our jupyter-apis changes.

Our backend in jupyter-apis uses Golang while upstream uses Python. To make ours compatible with theirs when we push upstream, we should put the Go backend as a folder in stc-master for now.

@saffaalvi
Copy link
Author

saffaalvi commented Feb 19, 2021

After merging jupyter-apis into the jupyter-web-app, we have decided this is not the best method to push our features upstream.

From the first attempt at merging using git merge --allow-unrelated-histories, the contents of jupyter-apis were merged into the main directory in StatCan/kubeflow. When moving the files back into components/jupyter-web-app, this caused the files to lose all their commit history. For reference, the branch with this method can be found here: https://github.com/StatCan/kubeflow/tree/merge-jupyter-apis

The second attempt at merging started off the same way as the first, with git merge --allow-unrelated-histories, but to move the files back into jupyter-web-app, git filter-repo --path-rename <old-filename>:<new-file-name> --force was used to keep the file history. However, this caused all the associated commits to be re-written and we would have to push all those commits (over 2000) back upstream. For reference, the branch with this method can be found here: https://github.com/StatCan/kubeflow/tree/merge-jupyter-apis-2

Instead, we will start manually adding in our new features to keep a cleaner and more understandable history as well as easier tracking for the features.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants