diff --git a/docs/source/tutorial/intro.md b/docs/source/tutorial/intro.md index 6d3a71a98..0cecbb946 100644 --- a/docs/source/tutorial/intro.md +++ b/docs/source/tutorial/intro.md @@ -228,7 +228,6 @@ The {class}`~.ipyparallel.Cluster` and {class}`~.ipyparallel.Client` classes can for easier cleanup of resources. - Entering a `Cluster` context - 1. starts the cluster 2. waits for engines to be ready 3. connects a client diff --git a/ipyparallel/engine/app.py b/ipyparallel/engine/app.py index 9028f400e..6626fc614 100755 --- a/ipyparallel/engine/app.py +++ b/ipyparallel/engine/app.py @@ -720,17 +720,13 @@ def send_with_metadata( kernel_kwargs["control_thread"] = control_thread = ControlThread( daemon=True ) - if ipykernel.version_info >= (7,): - kernel_kwargs["shell_socket"] = zmq.asyncio.Socket(shell_socket) - kernel_kwargs["control_socket"] = zmq.asyncio.Socket(control_socket) - else: - # Kernel.start starts control thread in kernel 7 - control_thread.start() - kernel_kwargs["control_stream"] = zmqstream.ZMQStream( - control_socket, control_thread.io_loop - ) - kernel_kwargs["shell_streams"] = [zmqstream.ZMQStream(shell_socket)] + control_thread.start() + kernel_kwargs["control_stream"] = zmqstream.ZMQStream( + control_socket, control_thread.io_loop + ) + + kernel_kwargs["shell_streams"] = [zmqstream.ZMQStream(shell_socket)] self.kernel = Kernel.instance( parent=self, @@ -954,12 +950,7 @@ def initialize(self, argv=None): self.forward_logging() def init_signal(self): - if ipykernel.version_info >= (7,): - # ipykernel 7 changes SIGINT handling - # to the app instead of the kernel - self.kernel_app.init_signal() - else: - signal.signal(signal.SIGINT, self._signal_sigint) + signal.signal(signal.SIGINT, self._signal_sigint) signal.signal(signal.SIGTERM, self._signal_stop) def _signal_sigint(self, sig, frame): diff --git a/ipyparallel/nbextension/static/clusterlist.js b/ipyparallel/nbextension/static/clusterlist.js index b7e1cc240..07d0e6205 100644 --- a/ipyparallel/nbextension/static/clusterlist.js +++ b/ipyparallel/nbextension/static/clusterlist.js @@ -199,8 +199,8 @@ define(["base/js/namespace", "jquery", "base/js/utils"], function ( that.cluster_list.load_list(); }, error: function (xhr, status, error) { - utils.log_ajax_error(xhr, status, error), - status_col.text("error stopping cluster"); + (utils.log_ajax_error(xhr, status, error), + status_col.text("error stopping cluster")); }, }; status_col.text("stopping");