Skip to content

Commit 6d04ad2

Browse files
authored
Merge pull request #695 from minrk/rm-parallel
Remove references to deprecated ipyparallel
2 parents a818961 + a947f87 commit 6d04ad2

File tree

2 files changed

+1
-209
lines changed

2 files changed

+1
-209
lines changed

ipykernel/tests/test_serialize.py

Lines changed: 0 additions & 201 deletions
This file was deleted.

ipykernel/zmqshell.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,6 @@
4545
from jupyter_core.paths import jupyter_runtime_dir
4646
from jupyter_client.session import extract_header, Session
4747

48-
try:
49-
# available since ipyparallel 5.0.0
50-
from ipyparallel.engine.datapub import ZMQDataPublisher
51-
except ImportError:
52-
# Deprecated since ipykernel 4.3.0
53-
from ipykernel.datapub import ZMQDataPublisher
54-
5548
#-----------------------------------------------------------------------------
5649
# Functions and classes
5750
#-----------------------------------------------------------------------------
@@ -445,7 +438,7 @@ class ZMQInteractiveShell(InteractiveShell):
445438

446439
displayhook_class = Type(ZMQShellDisplayHook)
447440
display_pub_class = Type(ZMQDisplayPublisher)
448-
data_pub_class = Type(ZMQDataPublisher)
441+
data_pub_class = Any()
449442
kernel = Any()
450443
parent_header = Any()
451444

0 commit comments

Comments
 (0)