diff --git a/docs/source/nbclassic.rst b/docs/source/nbclassic.rst index d1c937cc3..426e886d6 100644 --- a/docs/source/nbclassic.rst +++ b/docs/source/nbclassic.rst @@ -20,6 +20,9 @@ way to continue using the Jupyter Notebook 6 tech-stack as they transition to using the Jupyter Notebook 7. The NbClassic package intends to address that need. +You can read more about the migration impacts and coexistence of NbClassic and Notebook package on +the `NbClassic and Notebook mibration plan `_ page. + .. _Jupyter Enhancement Proposal #79: https://jupyter.org/enhancement-proposals/79-notebook-v7/notebook-v7.html .. _NbClassicUsage: @@ -55,72 +58,6 @@ You can view a list of the available options by typing:: $ jupyter nbclassic --help -NbClassic in the Jupyter Ecosystem -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Read more details about the changes currently taking place in the -Jupyter Ecosystem in this `team-compass issue`_. - -**NbClassic and Notebook 7** - -You can install NbClassic, Notebook 7 and JupyterLab, all three of -which will be providing different user interfaces that will be available -on the same server. When Notebook 7 is available, the NbClassic UI, will -be served at the ``/nbclassic/tree`` base path rather than the -base path ``/tree`` used otherwise. If you are using Notebook 7 along -with NbClassic, you wil also have JupyterLab installed as it is a -dependency of Notebook 7, and these front ends will be available -through the following base paths: JupyterLab at ``/lab``, Notebook 7 at -``/tree``, and NbClassic at ``/nbclassic/tree``. - -**NbClassic and Notebook 6.5.x** - -As NbClassic provides the static assets for Notebook 6.5.x, while -having both installed should cause no issues, the user interface provided -by these two packages will be the same. These UIs would be available in -different servers. An NbClassic instance will be at a server with the -``/tree`` path and opening a Notebook 6.5.x instance will open on a -different server with the ``/tree`` path as well, presenting the same -static assets. When starting an instance of JupyterLab you will be able -to access the classic view of Notebook with NbClassic served on the same -server at ``/tree``. - -**NbClassic and Notebook <= 6.4.x** - -When using NbClassic and Notebook <= 6.4.x you can expect that these UIs -will not be only presented at different servers, meaning they will both -be available at their respective server under ``/tree`` but they -may also differ as potential changes to the NbClassic UI will not be -reflected in Notebook versions <= 6.4.x. In this case as well, you would -be able to access the classic view of Notebook with NbClassic served on -the same server, at ``/tree``. - -**NbClassic and JupyterLab 3.x** - -When only JupyterLab 3.x is installed, then NbClassic does not have to be -explicitly installed as JupyterLab 3.x depends on it. They will run on -the same server, and are reachable via ``/tree`` for NbClassic and -``/lab`` for JupyterLab. - -**NbClassic and JupyterLab 4.x** - -When only JupyterLab 4.x is installed, then NbClassic has to be installed -explictly. They will run on the same server, and are reachable via -``/tree`` for NbClassic, and ``/lab`` for JupyterLab. - -**NbClassic Independently** - -When you choose to install only NbClassic via ``pip install nbclassic``, -the classic Notebook UI will be presented at the ``/tree`` path. As the -other frontends are not installed, attempting to access the other paths -will return errors. Note that NbClassic being a Jupyter Server extension, -indicated Jupyter Server will be available. This provides an additional -way to view the NbClassic frontend. You would be able to manually -enable the extension when running an instance of Jupyter Server, -``> jupyter server --ServerApp.jpserver_extensions="nbclassic=True"``, -which will provide the NbClassic frontend at ``/tree`` path when visited. - -.. _team-compass issue: https://github.com/jupyter/notebook-team-compass/issues/5#issuecomment-1085254000 - NbClassic Development --------------------- @@ -148,5 +85,5 @@ Jupyter Notebook 7. ou can find a helpful list of classical Notebook extensions and corresponding Jupyterlab extensions if available at the `Jupyterlab-contrib website `_. +.. _JEP #79: https://jupyter.org/enhancement-proposals/79-notebook-v7/notebook-v7.html -.. _JEP #79: https://jupyter.org/enhancement-proposals/79-notebook-v7/notebook-v7.html \ No newline at end of file diff --git a/nbclassic/notebookapp.py b/nbclassic/notebookapp.py index b1cd0d6de..acc687d40 100644 --- a/nbclassic/notebookapp.py +++ b/nbclassic/notebookapp.py @@ -325,6 +325,20 @@ def initialize_handlers(self): router.add_rules(core_rules) router.add_rules(static_handlers) router.add_rules(final_rules) + print(""" + _ _ _ _ + | | | |_ __ __| |__ _| |_ ___ + | |_| | '_ \/ _` / _` | _/ -_) + \___/| .__/\__,_\__,_|\__\___| + |_| + +Read the migration plan to Notebook 7 to learn about the new features and the actions to take if you are using extensions. + +https://jupyter-notebook.readthedocs.io/en/latest/migrate_to_notebook7.html + +Please note that updating to Notebook 7 might break some of your extensions. +""") + # ----------------------------------------------------------------------------- # Main entry point diff --git a/nbclassic/static/base/js/namespace.js b/nbclassic/static/base/js/namespace.js index bb1431baa..a791249f4 100644 --- a/nbclassic/static/base/js/namespace.js +++ b/nbclassic/static/base/js/namespace.js @@ -73,7 +73,7 @@ define(function(){ // tree jglobal('SessionList','tree/js/sessionlist'); - Jupyter.version = "0.5.1"; + Jupyter.version = "0.6.0.dev0"; Jupyter._target = '_blank'; return Jupyter; diff --git a/nbclassic/templates/page.html b/nbclassic/templates/page.html index cbf5c2a1c..2cfec8f16 100644 --- a/nbclassic/templates/page.html +++ b/nbclassic/templates/page.html @@ -137,6 +137,26 @@