Use inline by default and bump version

2 files changed, 33 insertions, 39 deletions

diff --git a/scilab_kernel.py b/scilab_kernel.py
index e7f1870..f682d94 100644
--- a/scilab_kernel.py
+++ b/scilab_kernel.py
@@ -19,7 +19,7 @@ import base64
 from shutil import rmtree
 from xml.dom import minidom
 
-__version__ = '0.5.2'
+__version__ = '0.5.4'
 
 version_pat = re.compile(r'version "(\d+(\.\d+)+)')
 
@@ -87,7 +87,7 @@ class ScilabKernel(Kernel):
         self.max_hist_cache = 1000
         self.hist_cache = []
 
-        self.inline = False
+        self.inline = True
         self.plot_format = 'png' if not os.name == 'nt' else 'svg'
         self.plot_size = '640,480'
         p = self.inline_parser = OptionParser()
diff --git a/setup.py b/setup.py
index 93d21e9..0b46fb1 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,13 @@
-from setuptools import setup
-from setuptools.command.install import install
-import json
+from distutils.core import setup
 import os
+import json
 import sys
-from distutils import log
+
+try:
+    from jupyter_client.kernelspec import install_kernel_spec
+except ImportError:
+    from IPython.kernel.kernelspec import install_kernel_spec
+from IPython.utils.tempdir import TemporaryDirectory
 
 
 kernel_json = {"argv": [sys.executable, "-m", "scilab_kernel", "-f",
@@ -14,37 +18,6 @@ kernel_json = {"argv": [sys.executable, "-m", "scilab_kernel", "-f",
                "name": "scilab_kernel",
                }
 
-
-class install_with_kernelspec(install):
-
-    def run(self):
-        user = '--user' in sys.argv
-        # Regular installation
-        install.run(self)
-
-        # Now write the kernelspec
-        try:
-            from ipykernel.kerspec import install_kernel_spec
-        except ImportError:
-            from IPython.kernel.kernelspec import install_kernel_spec
-        from IPython.utils.tempdir import TemporaryDirectory
-        with TemporaryDirectory() as td:
-            os.chmod(td, 0o755)  # Starts off as 700, not user readable
-            with open(os.path.join(td, 'kernel.json'), 'w') as f:
-                json.dump(kernel_json, f, sort_keys=True)
-            log.info('Installing kernel spec')
-            kernel_name = kernel_json['name']
-            try:
-                install_kernel_spec(td, kernel_name, user=user,
-                                    replace=True)
-            except:
-                install_kernel_spec(td, kernel_name, user=not user,
-                                    replace=True)
-
-
-with open('README.rst') as f:
-    readme = f.read()
-
 # get the library version from the file
 with open('scilab_kernel.py') as f:
     lines = f.readlines()
@@ -57,15 +30,36 @@ if svem_flag in sys.argv:
     # Die, setuptools, die.
     sys.argv.remove(svem_flag)
 
+
+def _is_root():
+    try:
+        return os.geteuid() == 0
+    except AttributeError:
+        return False  # assume not an admin on non-Unix platforms
+
+
+if 'develop' in sys.argv or 'install' in sys.argv:
+    user = '--user' in sys.argv or not _is_root()
+    with TemporaryDirectory() as td:
+        os.chmod(td, 0o755)  # Starts off as 700, not user readable
+        with open(os.path.join(td, 'kernel.json'), 'w') as f:
+            json.dump(kernel_json, f, sort_keys=True)
+        kernel_name = kernel_json['name']
+        try:
+            install_kernel_spec(td, kernel_name, user=user,
+                                replace=True)
+        except:
+            install_kernel_spec(td, kernel_name, user=not user,
+                                replace=True)
+
 setup(name='scilab_kernel',
       version=version,
       description='A Scilab kernel for IPython',
-      long_description=readme,
+      long_description=open('README.rst', 'r').read(),
       author='Steven Silvester',
       author_email='steven.silvester@ieee.org',
       url='https://github.com/blink1073/scilab_kernel',
       py_modules=['scilab_kernel'],
-      cmdclass={'install': install_with_kernelspec},
       install_requires=['scilab2py >= 0.3', 'IPython >= 3.0'],
       classifiers=[
           'Framework :: IPython',