Update base handler

Dockerfile

@@ -1,4 +1,4 @@
-FROM jupyter/scipy-notebook
+FROM jupyter/scipy-notebook:latest
 
 USER root
 
@@ -16,8 +16,13 @@ RUN mkdir /opt/nbtags && \
     chmod +x /usr/local/bin/before-notebook.d/*.sh
 USER $NB_UID
 
-RUN jupyter nbextensions_configurator enable --user && \
-    jupyter nbextension install --py --user nbtags && \
-    jupyter serverextension enable --py --user nbtags && \
-    jupyter nbextension enable --py --user nbtags && \
+RUN jupyter nbclassic-extension install --py jupyter_nbextensions_configurator --user && \
+    jupyter nbclassic-extension enable --py jupyter_nbextensions_configurator --user && \
+    jupyter nbclassic-serverextension enable --py jupyter_nbextensions_configurator --user && \
+    jupyter nbclassic-extension install --py --user nbtags && \
+    jupyter nbclassic-serverextension enable --py --user nbtags && \
+    jupyter nbclassic-extension enable --py --user nbtags && \
     jupyter nblineage quick-setup --user
+
+# Make classic notebook the default
+ENV DOCKER_STACKS_JUPYTER_CMD=nbclassic

nbtags/_version.py

@@ -1,2 +1,2 @@
-version_info = (0, 1, 0, 'dev1')
+version_info = (0, 2, 0, 'dev1')
 __version__ = '.'.join(map(str, version_info))

nbtags/handler.py

@@ -1,12 +1,11 @@
-from notebook.base.handlers import IPythonHandler
+from jupyter_server.base.handlers import APIHandler, JupyterHandler
 from tornado import web
 import json
-import itertools
 import re
 from nbtags.scrapbox import ScrapboxAPI
 
 
-class TagsHandler(IPythonHandler):
+class TagsHandler(APIHandler):
     def initialize(self, nb_app):
         self.nb_app = nb_app
 
@@ -96,7 +95,7 @@ def _has_code(self, text):
         return text.startswith('code:cell.') or text.strip() == 'code:toc.md'
 
 
-class CellCreateURLHandler(IPythonHandler):
+class CellCreateURLHandler(JupyterHandler):
     def initialize(self, nb_app):
         self.nb_app = nb_app
 
@@ -134,7 +133,7 @@ def _get_content(self, cell):
             return ''
 
 
-class NotebookCreateURLHandler(IPythonHandler):
+class NotebookCreateURLHandler(JupyterHandler):
     def initialize(self, nb_app):
         self.nb_app = nb_app
 
@@ -159,7 +158,7 @@ def _get_content(self, toc):
         return 'code:toc.md\n' + '\n'.join(['  ' + l for l in toc])
 
 
-class NotebookMemeHandler(IPythonHandler):
+class NotebookMemeHandler(APIHandler):
     def initialize(self, nb_app):
         self.nb_app = nb_app
 

nbtags/nbextension/main.yml

@@ -5,4 +5,5 @@ Description: "Sticky Note for Jupyter Notebook"
 Link: README.md
 Icon: main.png
 Main: main.js
-Compatibility: 5.x 6.x
+# 1.x means nbclassic - leave 6.x in place just in case.
+Compatibility: 1.x 6.x

nbtags/nbextension/tree.yml

@@ -5,4 +5,5 @@ Description: "Sticky Note for Jupyter Notebook"
 Link: README.md
 Icon: tree.png
 Main: tree.js
-Compatibility: 5.x 6.x
+# 1.x means nbclassic - leave 6.x in place just in case.
+Compatibility: 1.x 6.x

requirements.txt

@@ -1 +1 @@
-notebook>=5.0.0
+notebook>=6.5.4

setup.py

@@ -17,7 +17,7 @@
                   package_data={'nbtags': ['nbextension/*']},
                   include_package_data=True,
                   platforms=['Jupyter Notebook 5.x', 'Jupyter Notebook 6.x'],
-                  install_requires=['notebook>=5.0.0'])
+                  install_requires=['notebook>=6.5.4'])
 
 if __name__ == '__main__':
     setup(**setup_args)