Clean up installation

Author: blink1073

MANIFEST.in

@@ -1,2 +1,4 @@
 include versioneer.py
 include matlab_kernel/_version.py
+include matlab_kernel/kernel.json
+recursive-include matlab_kernel *.png

Makefile

@@ -5,15 +5,15 @@ export NAME=`python setup.py --name 2>/dev/null`
 export VERSION=`python setup.py --version 2>/dev/null`
 
 all: clean
-	python setup.py install
+	pip install .
 
 clean:
 	rm -rf build
 	rm -rf dist
 
 test: clean
-	python setup.py build
-	python -m matlab_kernel install
+	pip install .
+	python -c "from jupyter_client.kernelspec import find_kernel_specs; assert 'matlab' in find_kernel_specs()"
 
 release: test clean
 	pip install wheel

README.rst

@@ -10,7 +10,6 @@ To install::
     $ pip install matlab_kernel
     # or `pip install git+https://github.com/Calysto/matlab_kernel`
     # for the devel version.
-    $ python -m matlab_kernel install
 
 To use it, run one of::
 
@@ -35,4 +34,10 @@ open figures to image files whose format and resolution are defined using the
 ``%plot`` magic.  The resulting image is shown inline in the notebook.  You can
 use ``%plot native`` to raise normal Matlab windows instead.
 
+
+Advanced Installation Notes:: 
+
+We automatically install a Jupyter kernelspec when installing the python package. This location can be found using ``jupyter kernelspec list``. If the default location is not desired, you can remove the directory for the octave kernel, and install using python -m matlab_kernel install. See python -m matlab_kernel install --help for available options.
+
+
 .. _online: http://nbviewer.ipython.org/github/Calysto/matlab_kernel/blob/master/matlab_kernel.ipynb

matlab_kernel/kernel.json

@@ -0,0 +1,8 @@
+{
+    "argv": [
+        "python", "-m", "matlab_kernel", "-f", "{connection_file}"],
+    "display_name": "Matlab",
+    "language": "matlab",
+    "mimetype": "text/x-octave",
+    "name": "matlab",
+}

matlab_kernel/kernel.py

@@ -8,6 +8,7 @@
     from StringIO import StringIO
 except ImportError:
     from io import StringIO
+import json
 import os
 import sys
 try:
@@ -32,28 +33,31 @@ def __init__(self, writer):
         self.write = writer
 
 
+def get_kernel_json():
+    """Get the kernel json for the kernel.
+    """
+    here = os.path.dirname(__file__)
+    with open(os.path.join(here, 'kernel.json')) as fid:
+        data = json.load(fid)
+    data['argv'][0] = sys.executable
+    return data
+
+
 class MatlabKernel(MetaKernel):
     implementation = "Matlab Kernel"
     implementation_version = __version__,
     language = "matlab"
     language_version = __version__,
     banner = "Matlab Kernel"
     language_info = {
-        "mimetype": "text/x-matlab",
+        "mimetype": "text/x-octave",
         "codemirror_mode": "octave",
         "name": "matlab",
         "file_extension": ".m",
         "version": __version__,
         "help_links": MetaKernel.help_links,
     }
-    kernel_json = {
-        "argv": [
-            sys.executable, "-m", "matlab_kernel", "-f", "{connection_file}"],
-        "display_name": "Matlab",
-        "language": "matlab",
-        "mimetype": "text/x-matlab",
-        "name": "matlab",
-    }
+    kernel_json = get_kernel_json()
 
     def __init__(self, *args, **kwargs):
         super(MatlabKernel, self).__init__(*args, **kwargs)

setup.py

@@ -1,3 +1,4 @@
+import glob
 from setuptools import setup, find_packages
 
 with open('matlab_kernel/__init__.py', 'rb') as fid:
@@ -7,6 +8,16 @@
             version = line.strip().split()[-1][1:-1]
             break
 
+DISTNAME = 'matlab_kernel'
+PACKAGE_DATA = {
+    DISTNAME: ['*.m'] + glob.glob('%s/**/*.*' % DISTNAME)
+}
+DATA_FILES = [
+    ('share/jupyter/kernels/octave', [
+        '%s/kernel.json' % DISTNAME
+     ] + glob.glob('%s/images/*.png' % DISTNAME)
+    )
+]
 
 if __name__ == "__main__":
     setup(name="matlab_kernel",
@@ -21,6 +32,9 @@
                        "Programming Language :: Python :: 3.5",
                        "Topic :: System :: Shells"],
           packages=find_packages(include=["matlab_kernel", "matlab_kernel.*"]),
+          package_data=PACKAGE_DATA,
+          include_package_data=True,
+          data_files=DATA_FILES,
           requires=["metakernel (>0.18.0)", "jupyter_client (>=4.4.0)",
                     "ipython (>=4.0.0)"],
           install_requires=["metakernel>=0.18.0", "jupyter_client >=4.4.0",