upgrade Splash-Jupyter to Jupyter 4.0.0

scrapinghub · Sep 4, 2015 · bbf3404 · bbf3404
1 parent 1501911
commit bbf3404
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/dockerfiles/splash-jupyter/Dockerfile b/dockerfiles/splash-jupyter/Dockerfile
@@ -17,7 +17,7 @@ RUN add-apt-repository -y ppa:chris-lea/zeromq && \
         libzmq3-dev \
         libsqlite3-dev && \
     /usr/local/bin/pip install --no-cache-dir \
-        ipython[notebook]==3.2.1 && \
+        ipython[notebook]==4.0.0 && \
     apt-get remove -y --purge \
         python-dev \
         build-essential \

diff --git a/splash/kernel/kernelbase.py b/splash/kernel/kernelbase.py
@@ -8,9 +8,9 @@
 import time
 import sys
 
-from IPython.utils.jsonutil import json_clean
-from IPython.utils import py3compat
-from IPython.kernel.zmq.kernelbase import Kernel as _Kernel
+from ipython_genutils import py3compat
+from ipykernel.jsonutil import json_clean
+from ipykernel.kernelbase import Kernel as _Kernel
 
 
 if hasattr(_Kernel, "send_execute_reply"):
@@ -30,7 +30,7 @@ def __init__(self, **kwargs):
             # publish 'idle' state at the end. This is not correct
             # in presence of async handlers. Overriding dispatch_control
             # and dispatch_shell is problematic because it is a big copy-paste.
-            # So all handlers are overridden to set "indle" at the end,
+            # So all handlers are overridden to set "idle" at the end,
             # and _publish_status skips "idle" by default.
 
             this = self