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

Migrating to jupyter-server 2, jupyter_client 7.x #1308

Merged
merged 6 commits into from
Apr 3, 2023
Merged

Migrating to jupyter-server 2, jupyter_client 7.x #1308

merged 6 commits into from
Apr 3, 2023

Conversation

trungleduc
Copy link
Member

@trungleduc trungleduc commented Mar 20, 2023 •
edited
Loading

This PR is based on #1283 to make voila works with jupyter_server 2

References

Partially closes #1304
Closes #1283

User-facing changes

  • Voila now supports the token authentication by using the PasswordIdentityProvider of jupyter_server, but it is disabled by default.
  • To start Voila with auto-generated token:
voila --token notebook.ipynb
  • To start Voila with personalized token:
voila --token=my-secret-token notebook.ipynb

Users will be redirected to the login page if they are trying to access a token-protected voila app.

voila-server2

Backwards-incompatible changes

python 3.7 is no longer supported.
jupyter_client < 7.4.4 is no longer supported.

@github-actions
Copy link
Contributor

Binder 👈 Launch a Binder on branch trungleduc/voila/server-2

@trungleduc trungleduc added the enhancement New feature or request label Mar 20, 2023
@trungleduc trungleduc force-pushed the server-2 branch 3 times, most recently from cd1d3a9 to ebe0edb Compare March 20, 2023 13:26
jtpio
jtpio reviewed Mar 20, 2023
View reviewed changes
.github/workflows/main.yml
@@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
python_version: ['3.7', '3.8', '3.9', '3.10']
python_version: ['3.8', '3.9', '3.10']
Copy link
Member

Choose a reason for hiding this comment

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

Maybe worth testing on 3.11 as well?

Copy link
Member

Choose a reason for hiding this comment

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

ah never mind that, forgot we already have a PR for this: #1240

@trungleduc trungleduc force-pushed the server-2 branch 2 times, most recently from 6219c44 to 1286f00 Compare March 20, 2023 23:30
@trungleduc trungleduc mentioned this pull request Mar 21, 2023
Closed
@trungleduc trungleduc force-pushed the server-2 branch 19 times, most recently from 0ee39ae to 4b92e73 Compare March 22, 2023 11:50
@trungleduc
Copy link
Member Author

update galata references

jtpio
jtpio reviewed Apr 3, 2023
View reviewed changes
pyproject.toml Show resolved Hide resolved
@jtpio jtpio added this to the 0.5.0 milestone Apr 3, 2023
@jtpio
Copy link
Member

jtpio commented Apr 3, 2023

Not sure it's related but the Binder seems to be failing to build:

image

Wanted to double check the switch to Jupyter Server 2 does not cause issues on Binder.

@trungleduc trungleduc changed the title Migrating to jupyter-server 2 Migrating to jupyter-server 2, jupyter_client 7.x Apr 3, 2023
@trungleduc trungleduc force-pushed the server-2 branch 3 times, most recently from eaca071 to 6fbc7b4 Compare April 3, 2023 10:09
@trungleduc
Copy link
Member Author

Not sure it's related but the Binder seems to be failing to build:

image

Wanted to double check the switch to Jupyter Server 2 does not cause issues on Binder.

It works now

jtpio
jtpio approved these changes Apr 3, 2023
View reviewed changes
Copy link
Member

@jtpio jtpio 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 jtpio merged commit e30f6aa into voila-dashboards:main Apr 3, 2023
@martinRenou
Copy link
Member

🚀 !

This was referenced May 3, 2023
Closed
Closed
@martinRenou martinRenou mentioned this pull request Jul 25, 2023
Closed
@martinRenou
Copy link
Member

martinRenou commented Jul 26, 2023 •
edited
Loading

@trungleduc do you think it would be feasible to backport this to Voila 0.4? Or should this be considered a breaking change?

@martinRenou
Copy link
Member

@meeseeksdev please backport to 0.4.x

@lumberbot-app
Copy link

lumberbot-app bot commented Jul 26, 2023

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 0.4.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 e30f6aafacd4cfc7a7d4d3758ca80ecd933ea044
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #1308: Migrating to `jupyter-server` 2, `jupyter_client` 7.x'
  1. Push to a named branch:
git push YOURFORK 0.4.x:auto-backport-of-pr-1308-on-0.4.x
  1. Create a PR against branch 0.4.x, I would have named this PR:

"Backport PR #1308 on branch 0.4.x (Migrating to jupyter-server 2, jupyter_client 7.x)"

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.

@trungleduc
Copy link
Member Author

Since jupyterlab 3.6 can support both jupyter-server 1 and 2 so i think we can do the same for voila.

@martinRenou
Copy link
Member

Thanks! I'll give it a try

martinRenou pushed a commit to martinRenou/voila that referenced this pull request Jul 26, 2023
@trungleduc @martinRenou
Migrating to jupyter-server 2, jupyter_client 7.x (voila-dashboar…
60a1863 
…ds#1308)

* Get changes from voila-dashboards#1283

Co-authored-by: Mike <jabbera@users.noreply.github.com>

* Update tree handler

* Add token flag

* Update error template

* Fix types/node version issue

* Update binder build

---------

Co-authored-by: Mike <jabbera@users.noreply.github.com>
(cherry picked from commit e30f6aa)
@martinRenou martinRenou mentioned this pull request Jul 26, 2023
Closed
martinRenou pushed a commit to martinRenou/voila that referenced this pull request Jul 26, 2023
@trungleduc @martinRenou
Migrating to jupyter-server 2, jupyter_client 7.x (voila-dashboar…
d0c9244 
…ds#1308)

* Get changes from voila-dashboards#1283

Co-authored-by: Mike <jabbera@users.noreply.github.com>

* Update tree handler

* Add token flag

* Update error template

* Fix types/node version issue

* Update binder build

---------

Co-authored-by: Mike <jabbera@users.noreply.github.com>
(cherry picked from commit e30f6aa)
martinRenou pushed a commit to martinRenou/voila that referenced this pull request Jul 26, 2023
@trungleduc @martinRenou
Migrating to jupyter-server 2, jupyter_client 7.x (voila-dashboar…
baaa176 
…ds#1308)

* Get changes from voila-dashboards#1283

Co-authored-by: Mike <jabbera@users.noreply.github.com>

* Update tree handler

* Add token flag

* Update error template

* Fix types/node version issue

* Update binder build

---------

Co-authored-by: Mike <jabbera@users.noreply.github.com>
(cherry picked from commit e30f6aa)
martinRenou pushed a commit to martinRenou/voila that referenced this pull request Jul 27, 2023
@trungleduc @martinRenou
Migrating to jupyter-server 2, jupyter_client 7.x (voila-dashboar…
f959d28 
…ds#1308)

* Get changes from voila-dashboards#1283

Co-authored-by: Mike <jabbera@users.noreply.github.com>

* Update tree handler

* Add token flag

* Update error template

* Fix types/node version issue

* Update binder build

---------

Co-authored-by: Mike <jabbera@users.noreply.github.com>
(cherry picked from commit e30f6aa)
martinRenou pushed a commit to martinRenou/voila that referenced this pull request Jul 28, 2023
@trungleduc @martinRenou
Migrating to jupyter-server 2, jupyter_client 7.x (voila-dashboar…
2992ac0 
…ds#1308)

* Get changes from voila-dashboards#1283

Co-authored-by: Mike <jabbera@users.noreply.github.com>

* Update tree handler

* Add token flag

* Update error template

* Fix types/node version issue

* Update binder build

---------

Co-authored-by: Mike <jabbera@users.noreply.github.com>
(cherry picked from commit e30f6aa)
martinRenou added a commit that referenced this pull request Jul 28, 2023
@martinRenou @trungleduc
0.4.x: Rebuild against JupyterLab 4 and jupyter_server 2 (#1358)
dc68959 
* Rebuild against JupyterLab 4

* Migrating to `jupyter-server` 2, `jupyter_client` 7.x (#1308)

* Get changes from #1283

Co-authored-by: Mike <jabbera@users.noreply.github.com>

* Update tree handler

* Add token flag

* Update error template

* Fix types/node version issue

* Update binder build

---------

Co-authored-by: Mike <jabbera@users.noreply.github.com>
(cherry picked from commit e30f6aa)

* Downgrade galata

* Notebook 6 in tests

* Regenerate yarn.lock

* Debug

* Iterate

* Missing test dependency

* Fix dependency install

* Compat with jupyter server 1

* Syntax error

* Add tests for jupyter server 1

* Syntax error

* Flake8

---------

Co-authored-by: Duc Trung Le <leductrungxf@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtpio jtpio jtpio approved these changes

@martinRenou martinRenou Awaiting requested review from martinRenou

Assignees
No one assigned
Labels
enhancement New feature or request Still Needs Manual Backport
Projects
None yet
Milestone
0.5.0
Development

Successfully merging this pull request may close these issues.

Make voila compatible with jupyterlab 4
3 participants
@trungleduc @jtpio @martinRenou