Merge pull request #80 from minrk/ipyparallel

s/ipython_parallel/ipyparallel
This commit is contained in:
Thomas Kluyver 2015-05-11 16:00:47 -07:00
commit 6c0bfd9a9c

View File

@ -1,4 +1,4 @@
"""Manage ipython_parallel clusters in the notebook.""" """Manage IPython parallel clusters in the notebook."""
# Copyright (c) Jupyter Development Team. # Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License. # Distributed under the terms of the Modified BSD License.
@ -23,7 +23,7 @@ class ClusterManager(LoggingConfigurable):
return IOLoop.instance() return IOLoop.instance()
def build_launchers(self, profile_dir): def build_launchers(self, profile_dir):
from ipython_parallel.apps.ipclusterapp import IPClusterStart from ipyparallel.apps.ipclusterapp import IPClusterStart
class DummyIPClusterStart(IPClusterStart): class DummyIPClusterStart(IPClusterStart):
"""Dummy subclass to skip init steps that conflict with global app. """Dummy subclass to skip init steps that conflict with global app.