Separate Splash-Jupyter kernels for Python 2 and Python 3. See GH-371.

MANIFEST.in

@@ -14,4 +14,4 @@ recursive-include splash/lua_modules *.lua *.md *.rst *.txt
 recursive-include splash/tests *.txt *.js *.ini *.lua
 recursive-include splash/vendor/harviewer/webapp *.js *.html *.css *.gif *.png *.swf *.html
 recursive-include splash/kernel/inspections *.json
-recursive-include splash/kernel/kernels *.json
+recursive-include splash/kernel/kernels *.json *.png

dockerfiles/splash-jupyter/Dockerfile

@@ -16,7 +16,7 @@ RUN apt-get update -q && \
         libzmq3-dev \
         libsqlite3-dev && \
     pip3 install \
-        ipython[notebook]==4.0.2 && \
+        ipython[notebook]==4.0.3 && \
     apt-get remove -y --purge \
         python3-dev \
         build-essential \

setup.py

@@ -52,7 +52,8 @@ def get_version():
         'lua_modules/*.lua',
         'lua_modules/vendor/*.lua',
         'kernel/inspections/*.json',
-        'kernel/kernels/splash/*.json',
+        'kernel/kernels/splash-py2/*.*',
+        'kernel/kernels/splash-py3/*.*',
     ]},
     'zip_safe': False,
     'install_requires': [

splash/kernel/kernel.py

@@ -30,7 +30,8 @@
 
 def install(user=True):
     """ Install IPython kernel specification """
-    folder = os.path.join(os.path.dirname(__file__), 'kernels', 'splash')
+    name = 'splash-py2' if six.PY2 else 'splash-py3'
+    folder = os.path.join(os.path.dirname(__file__), 'kernels', name)
     install_kernel_spec(folder, kernel_name="splash", user=user, replace=True)
 
 

splash/kernel/kernels/splash-py3/kernel.json

@@ -0,0 +1,6 @@
+{
+  "argv": ["python3", "-m", "splash.kernel", "-f", "{connection_file}"],
+  "display_name": "Splash",
+  "name": "Splash",
+  "language": "lua"
+}