Merge pull request #121 from minrk/rm-clusters

remove clusters tab from notebook
jupyter · Jun 5, 2015 · c85fb52 · c85fb52
2 parents 9a9a749 + 5ba389d
commit c85fb52
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 474 deletions.
diff --git a/notebook/base/handlers.py b/notebook/base/handlers.py
@@ -166,10 +166,6 @@ def kernel_manager(self):
     def contents_manager(self):
         return self.settings['contents_manager']
 
-    @property
-    def cluster_manager(self):
-        return self.settings['cluster_manager']
-
     @property
     def session_manager(self):
         return self.settings['session_manager']

diff --git a/notebook/notebookapp.py b/notebook/notebookapp.py
@@ -59,7 +59,6 @@
 from .services.config import ConfigManager
 from .services.contents.manager import ContentsManager
 from .services.contents.filemanager import FileContentsManager
-from .services.clusters.clustermanager import ClusterManager
 from .services.sessions.sessionmanager import SessionManager
 
 from .auth.login import LoginHandler
@@ -134,20 +133,20 @@ def get(self, url_path):
 class NotebookWebApplication(web.Application):
 
     def __init__(self, ipython_app, kernel_manager, contents_manager,
-                 cluster_manager, session_manager, kernel_spec_manager,
+                 session_manager, kernel_spec_manager,
                  config_manager, log,
                  base_url, default_url, settings_overrides, jinja_env_options):
 
         settings = self.init_settings(
-            ipython_app, kernel_manager, contents_manager, cluster_manager,
+            ipython_app, kernel_manager, contents_manager,
             session_manager, kernel_spec_manager, config_manager, 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, ipython_app, kernel_manager, contents_manager,
-                      cluster_manager, session_manager, kernel_spec_manager,
+                      session_manager, kernel_spec_manager,
                       config_manager,
                       log, base_url, default_url, settings_overrides,
                       jinja_env_options=None):
@@ -197,7 +196,6 @@ def init_settings(self, ipython_app, kernel_manager, contents_manager,
             # managers
             kernel_manager=kernel_manager,
             contents_manager=contents_manager,
-            cluster_manager=cluster_manager,
             session_manager=session_manager,
             kernel_spec_manager=kernel_spec_manager,
             config_manager=config_manager,
@@ -233,7 +231,6 @@ def init_handlers(self, settings):
         handlers.extend(load_handlers('services.config.handlers'))
         handlers.extend(load_handlers('services.kernels.handlers'))
         handlers.extend(load_handlers('services.contents.handlers'))
-        handlers.extend(load_handlers('services.clusters.handlers'))
         handlers.extend(load_handlers('services.sessions.handlers'))
         handlers.extend(load_handlers('services.nbconvert.handlers'))
         handlers.extend(load_handlers('services.kernelspecs.handlers'))
@@ -661,11 +658,6 @@ def _mathjax_url_changed(self, name, old, new):
         config=True,
         help='The session manager class to use.'
     )
-    cluster_manager_class = Type(
-        default_value=ClusterManager,
-        config=True,
-        help='The cluster manager class to use.'
-    )
 
     config_manager_class = Type(
         default_value=ConfigManager,
@@ -803,11 +795,6 @@ def init_configurables(self):
             kernel_manager=self.kernel_manager,
             contents_manager=self.contents_manager,
         )
-        self.cluster_manager = self.cluster_manager_class(
-            parent=self,
-            log=self.log,
-        )
-
         self.config_manager = self.config_manager_class(
             parent=self,
             log=self.log,
@@ -841,7 +828,7 @@ def init_webapp(self):
 
         self.web_app = NotebookWebApplication(
             self, self.kernel_manager, self.contents_manager,
-            self.cluster_manager, self.session_manager, self.kernel_spec_manager,
+            self.session_manager, self.kernel_spec_manager,
             self.config_manager,
             self.log, self.base_url, self.default_url, self.tornado_settings,
             self.jinja_environment_options

diff --git a/notebook/services/clusters/__init__.py b/notebook/services/clusters/__init__.py
diff --git a/notebook/services/clusters/clustermanager.py b/notebook/services/clusters/clustermanager.py
diff --git a/notebook/services/clusters/handlers.py b/notebook/services/clusters/handlers.py