Drop kernel_spec_manager

jupyter · Oct 26, 2018 · 5765854 · 5765854
1 parent 102ae7b
commit 5765854
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 33 deletions.
diff --git a/notebook/base/handlers.py b/notebook/base/handlers.py
@@ -287,10 +287,6 @@ def session_manager(self):
     @property
     def terminal_manager(self):
         return self.settings['terminal_manager']
-
-    @property
-    def kernel_spec_manager(self):
-        return self.settings['kernel_spec_manager']
 
     @property
     def config_manager(self):

diff --git a/notebook/notebookapp.py b/notebook/notebookapp.py
@@ -95,7 +95,6 @@
 )
 from jupyter_core.paths import jupyter_config_path
 from jupyter_client import KernelManager
-from jupyter_client.kernelspec import KernelSpecManager, NoSuchKernel, NATIVE_KERNEL_NAME
 from jupyter_client.session import Session
 from jupyter_kernel_mgmt.discovery import KernelFinder
 from nbformat.sign import NotebookNotary
@@ -147,23 +146,22 @@ def load_handlers(name):
 class NotebookWebApplication(web.Application):
 
     def __init__(self, jupyter_app, kernel_manager, contents_manager,
-                 session_manager, kernel_spec_manager, kernel_finder,
+                 session_manager, kernel_finder,
                  config_manager, extra_services, log,
                  base_url, default_url, settings_overrides, jinja_env_options):
 
 
         settings = self.init_settings(
             jupyter_app, kernel_manager, contents_manager,
-            session_manager, kernel_spec_manager, kernel_finder, config_manager,
+            session_manager, kernel_finder, config_manager,
             extra_services, log, base_url,
             default_url, settings_overrides, jinja_env_options)
         handlers = self.init_handlers(settings)
 
         super(NotebookWebApplication, self).__init__(handlers, **settings)
 
     def init_settings(self, jupyter_app, kernel_manager, contents_manager,
-                      session_manager, kernel_spec_manager,
-                      kernel_finder,
+                      session_manager, kernel_finder,
                       config_manager, extra_services,
                       log, base_url, default_url, settings_overrides,
                       jinja_env_options=None):
@@ -258,7 +256,6 @@ def init_settings(self, jupyter_app, kernel_manager, contents_manager,
             kernel_manager=kernel_manager,
             contents_manager=contents_manager,
             session_manager=session_manager,
-            kernel_spec_manager=kernel_spec_manager,
             config_manager=config_manager,
 
             # handlers
@@ -569,7 +566,6 @@ class NotebookApp(JupyterApp):
     classes = [
         KernelManager, Session, MappingKernelManager,
         ContentsManager, FileContentsManager, NotebookNotary,
-        KernelSpecManager,
     ]
     flags = Dict(flags)
     aliases = Dict(aliases)
@@ -1142,20 +1138,6 @@ def _update_mathjax_config(self, change):
         help=_('The config manager class to use')
     )
 
-    kernel_spec_manager = Instance(KernelSpecManager, allow_none=True)
-
-    kernel_spec_manager_class = Type(
-        default_value=KernelSpecManager,
-        config=True,
-        help="""
-        The kernel spec manager class to use. Should be a subclass
-        of `jupyter_client.kernelspec.KernelSpecManager`.
-
-        The Api of KernelSpecManager is provisional and might change
-        without warning between this version of Jupyter and the next stable one.
-        """
-    )
-
     login_handler_class = Type(
         default_value=LoginHandler,
         klass=web.RequestHandler,
@@ -1311,16 +1293,12 @@ def parse_command_line(self, argv=None):
             self.update_config(c)
 
     def init_configurables(self):
-        self.kernel_spec_manager = self.kernel_spec_manager_class(
-            parent=self,
-        )
         self.kernel_finder = KernelFinder.from_entrypoints()
         self.kernel_manager = self.kernel_manager_class(
             parent=self,
             log=self.log,
             connection_dir=self.runtime_dir,
             kernel_finder=self.kernel_finder,
-            kernel_spec_manager=self.kernel_spec_manager,
         )
         self.contents_manager = self.contents_manager_class(
             parent=self,
@@ -1378,7 +1356,7 @@ def init_webapp(self):
 
         self.web_app = NotebookWebApplication(
             self, self.kernel_manager, self.contents_manager,
-            self.session_manager, self.kernel_spec_manager, self.kernel_finder,
+            self.session_manager, self.kernel_finder,
             self.config_manager, self.extra_services,
             self.log, self.base_url, self.default_url, self.tornado_settings,
             self.jinja_environment_options,

diff --git a/notebook/services/kernels/kernelmanager.py b/notebook/services/kernels/kernelmanager.py
@@ -17,10 +17,7 @@
 from tornado.concurrent import Future
 from tornado.ioloop import IOLoop, PeriodicCallback
 
-from jupyter_client.session import Session
-from jupyter_client.multikernelmanager import MultiKernelManager
 from jupyter_kernel_mgmt.client import IOLoopKernelClient
-from jupyter_kernel_mgmt.discovery import KernelFinder
 from jupyter_kernel_mgmt.restarter import TornadoKernelRestarter
 from traitlets import (Any, Bool, Dict, List, Unicode, TraitError, Integer,
        Float, Instance, default, validate