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

Depend on @jupyter/ydoc instead of @jupyter-notebook/ydoc #13506

Merged
merged 4 commits into from Dec 1, 2022

Conversation

jtpio
Copy link
Member

@jtpio jtpio commented Nov 29, 2022

References

Follow-up to jupyter-server/jupyter_ydoc#97

Code changes

Depend on jupyter/ydoc instead of jupyter-notebook/ydoc now that the package has been renamed and published.

User-facing changes

None

Backwards-incompatible changes

A different package will be in the shared scope, but this should only affect alpha releases of 4.0 and 3.6.

@jupyterlab-probot
Copy link

Thanks for making a pull request to jupyterlab!
To try out this branch on binder, follow this link: Binder

@jtpio jtpio modified the milestones: 3.6.x, 3.6.0 Nov 29, 2022
@jtpio jtpio changed the title Depend on jupyter/ydoc Depend on @jupyter/ydoc Nov 29, 2022
@jtpio jtpio changed the title Depend on @jupyter/ydoc Depend on @jupyter/ydoc instead of @jupyter-notebook/ydoc Nov 29, 2022
@jtpio
Copy link
Member Author

jtpio commented Nov 29, 2022

Marking as ready, remaining (Python) CI failures are being fixed in #13508

@jtpio jtpio marked this pull request as ready for review November 29, 2022 12:34
Copy link
Member

@hbcarlos hbcarlos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @jtpio!

@fcollonval fcollonval merged commit 27ba0af into jupyterlab:master Dec 1, 2022
@fcollonval
Copy link
Member

@meeseeksdev please backport to 3.6.x

@lumberbot-app
Copy link

lumberbot-app bot commented Dec 1, 2022

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 3.6.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 27ba0af7842ab369a8da9db8c9b8ddc7150182b5
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #13506: Depend on `@jupyter/ydoc` instead of `@jupyter-notebook/ydoc`'
  1. Push to a named branch:
git push YOURFORK 3.6.x:auto-backport-of-pr-13506-on-3.6.x
  1. Create a PR against branch 3.6.x, I would have named this PR:

"Backport PR #13506 on branch 3.6.x (Depend on @jupyter/ydoc instead of @jupyter-notebook/ydoc)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

@jtpio jtpio deleted the rename-jupyter-ydoc branch December 1, 2022 09:23
fcollonval added a commit to fcollonval/jupyterlab that referenced this pull request Dec 1, 2022
fcollonval added a commit that referenced this pull request Dec 1, 2022
hbcarlos pushed a commit to hbcarlos/jupyterlab that referenced this pull request Jan 29, 2023
…rlab#13506)

* Rename to `jupyter/ydoc`

* Use the latest `@jupyter/ydoc`

* Undo staging changes

* Lint the code

Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 2, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants