##// END OF EJS Templates
Merge pull request #6487 from minrk/md2md-nowrap...
Merge pull request #6487 from minrk/md2md-nowrap Don't rewrap markdown input in markdown output

File last commit:

r17748:a2ec27ac
r17934:e78e2425 merge
Show More
kernelspec.py
222 lines | 8.0 KiB | text/x-python | PythonLexer
Thomas Kluyver
First draft of new kernel registry machinery...
r16260 import io
import json
import os
Thomas Kluyver
Add API function to install a kernelspec
r16559 import shutil
Thomas Kluyver
Add supporting for making a directory for the native kernel
r16261 import sys
Thomas Kluyver
First draft of new kernel registry machinery...
r16260
pjoin = os.path.join
from IPython.utils.path import get_ipython_dir
from IPython.utils.py3compat import PY3
Jason Grout
Remove kernel spec __init__ completely...
r17686 from IPython.utils.traitlets import HasTraits, List, Unicode, Dict, Any
Thomas Kluyver
Simplify kernel manager code
r17748 from .launcher import make_ipkernel_cmd
Thomas Kluyver
First draft of new kernel registry machinery...
r16260
if os.name == 'nt':
programdata = os.environ.get('PROGRAMDATA', None)
if programdata:
Thomas Kluyver
Also look in /usr/local/share/ipython/kernels
r16825 SYSTEM_KERNEL_DIRS = [pjoin(programdata, 'ipython', 'kernels')]
Thomas Kluyver
First draft of new kernel registry machinery...
r16260 else: # PROGRAMDATA is not defined by default on XP.
Thomas Kluyver
Also look in /usr/local/share/ipython/kernels
r16825 SYSTEM_KERNEL_DIRS = []
Thomas Kluyver
First draft of new kernel registry machinery...
r16260 else:
Thomas Kluyver
Also look in /usr/local/share/ipython/kernels
r16825 SYSTEM_KERNEL_DIRS = ["/usr/share/ipython/kernels",
"/usr/local/share/ipython/kernels",
]
Thomas Kluyver
First draft of new kernel registry machinery...
r16260
NATIVE_KERNEL_NAME = 'python3' if PY3 else 'python2'
Thomas Kluyver
Deterministic order for kernels in notebook UI
r17381 def _pythonfirst(s):
"Sort key function that will put strings starting with 'python' first."
if s == NATIVE_KERNEL_NAME:
return ' ' + s # Two spaces to sort this first of all
elif s.startswith('python'):
# Space is not valid in kernel names, so this should sort first
return ' ' + s
return s
Thomas Kluyver
First draft of new kernel registry machinery...
r16260 class KernelSpec(HasTraits):
argv = List()
display_name = Unicode()
language = Unicode()
Jason Grout
Remove kernel spec __init__ completely...
r17686 codemirror_mode = Any() # can be unicode or dict
Thomas Kluyver
Add mechanism to specify environment variables in kernel spec
r16349 env = Dict()
Thomas Kluyver
First draft of new kernel registry machinery...
r16260 resource_dir = Unicode()
Jason Grout
Remove kernel spec __init__ completely...
r17686 def _codemirror_mode_default(self):
return self.language
Thomas Kluyver
First draft of new kernel registry machinery...
r16260
@classmethod
def from_resource_dir(cls, resource_dir):
Thomas Kluyver
Better describe functions in kernelspec module
r16262 """Create a KernelSpec object by reading kernel.json
Pass the path to the *directory* containing kernel.json.
"""
kernel_file = pjoin(resource_dir, 'kernel.json')
Thomas Kluyver
First draft of new kernel registry machinery...
r16260 with io.open(kernel_file, 'r', encoding='utf-8') as f:
kernel_dict = json.load(f)
return cls(resource_dir=resource_dir, **kernel_dict)
Thomas Kluyver
Put full kernel info in REST API response for all kernels
r16714
def to_dict(self):
return dict(argv=self.argv,
env=self.env,
display_name=self.display_name,
language=self.language,
codemirror_mode=self.codemirror_mode,
)
Thomas Kluyver
First draft of new kernel registry machinery...
r16260
Thomas Kluyver
Create REST API for kernel specs
r16684 def to_json(self):
Thomas Kluyver
Put full kernel info in REST API response for all kernels
r16714 return json.dumps(self.to_dict())
Thomas Kluyver
First draft of new kernel registry machinery...
r16260
def _is_kernel_dir(path):
Thomas Kluyver
Better describe functions in kernelspec module
r16262 """Is ``path`` a kernel directory?"""
Thomas Kluyver
First draft of new kernel registry machinery...
r16260 return os.path.isdir(path) and os.path.isfile(pjoin(path, 'kernel.json'))
def _list_kernels_in(dir):
Thomas Kluyver
Allow IPython directory to be passed down to kernel selection from App...
r16382 """Return a mapping of kernel names to resource directories from dir.
If dir is None or does not exist, returns an empty dict.
Thomas Kluyver
Better describe functions in kernelspec module
r16262 """
Thomas Kluyver
Miscellaneous fixes to kernelspec system
r16271 if dir is None or not os.path.isdir(dir):
Thomas Kluyver
First draft of new kernel registry machinery...
r16260 return {}
return {f.lower(): pjoin(dir, f) for f in os.listdir(dir)
if _is_kernel_dir(pjoin(dir, f))}
Thomas Kluyver
Nicer error message when kernel is not found
r16383 class NoSuchKernel(KeyError):
def __init__(self, name):
self.name = name
Thomas Kluyver
Allow IPython directory to be passed down to kernel selection from App...
r16382 class KernelSpecManager(HasTraits):
ipython_dir = Unicode()
def _ipython_dir_default(self):
return get_ipython_dir()
user_kernel_dir = Unicode()
def _user_kernel_dir_default(self):
return pjoin(self.ipython_dir, 'kernels')
Thomas Kluyver
Better describe functions in kernelspec module
r16262
Thomas Kluyver
Allow IPython directory to be passed down to kernel selection from App...
r16382 kernel_dirs = List(
help="List of kernel directories to search. Later ones take priority over earlier."
)
def _kernel_dirs_default(self):
Thomas Kluyver
Also look in /usr/local/share/ipython/kernels
r16825 return SYSTEM_KERNEL_DIRS + [
Thomas Kluyver
Allow IPython directory to be passed down to kernel selection from App...
r16382 self.user_kernel_dir,
]
Thomas Kluyver
Make installation of native kernelspec explicit...
r17747 @property
def _native_kernel_dict(self):
Thomas Kluyver
Allow IPython directory to be passed down to kernel selection from App...
r16382 """Makes a kernel directory for the native kernel.
The native kernel is the kernel using the same Python runtime as this
process. This will put its informatino in the user kernels directory.
"""
Thomas Kluyver
Simplify kernel manager code
r17748 return {'argv':make_ipkernel_cmd(
'from IPython.kernel.zmq.kernelapp import main; main()'),
Thomas Kluyver
Make installation of native kernelspec explicit...
r17747 'display_name': 'IPython (Python %d)' % (3 if PY3 else 2),
'language': 'python',
'codemirror_mode': {'name': 'ipython',
'version': sys.version_info[0]},
}
@property
def _native_kernel_resource_dir(self):
# TODO: This may be different when we actually have any resources
return os.path.dirname(__file__)
Thomas Kluyver
Allow IPython directory to be passed down to kernel selection from App...
r16382 def find_kernel_specs(self):
"""Returns a dict mapping kernel names to resource directories."""
d = {}
for kernel_dir in self.kernel_dirs:
d.update(_list_kernels_in(kernel_dir))
Thomas Kluyver
Make installation of native kernelspec explicit...
r17747
d[NATIVE_KERNEL_NAME] = self._native_kernel_resource_dir
Thomas Kluyver
Allow IPython directory to be passed down to kernel selection from App...
r16382 return d
# TODO: Caching?
Thomas Kluyver
Make installation of native kernelspec explicit...
r17747
Thomas Kluyver
Allow IPython directory to be passed down to kernel selection from App...
r16382 def get_kernel_spec(self, kernel_name):
"""Returns a :class:`KernelSpec` instance for the given kernel_name.
Thomas Kluyver
Nicer error message when kernel is not found
r16383 Raises :exc:`NoSuchKernel` if the given kernel name is not found.
Thomas Kluyver
Allow IPython directory to be passed down to kernel selection from App...
r16382 """
Thomas Kluyver
Make installation of native kernelspec explicit...
r17747 if kernel_name in {'python', NATIVE_KERNEL_NAME}:
return KernelSpec(self._native_kernel_resource_dir, **self._native_kernel_dict)
Thomas Kluyver
Allow IPython directory to be passed down to kernel selection from App...
r16382 d = self.find_kernel_specs()
Thomas Kluyver
Nicer error message when kernel is not found
r16383 try:
resource_dir = d[kernel_name.lower()]
except KeyError:
raise NoSuchKernel(kernel_name)
Thomas Kluyver
Allow IPython directory to be passed down to kernel selection from App...
r16382 return KernelSpec.from_resource_dir(resource_dir)
Thomas Kluyver
Make installation of native kernelspec explicit...
r17747
def _get_destination_dir(self, kernel_name, system=False):
if system:
if SYSTEM_KERNEL_DIRS:
return os.path.join(SYSTEM_KERNEL_DIRS[-1], kernel_name)
else:
raise EnvironmentError("No system kernel directory is available")
else:
return os.path.join(self.user_kernel_dir, kernel_name)
Thomas Kluyver
Add supporting for making a directory for the native kernel
r16261
Thomas Kluyver
Add API function to install a kernelspec
r16559 def install_kernel_spec(self, source_dir, kernel_name=None, system=False,
replace=False):
"""Install a kernel spec by copying its directory.
If ``kernel_name`` is not given, the basename of ``source_dir`` will
be used.
If ``system`` is True, it will attempt to install into the systemwide
kernel registry. If the process does not have appropriate permissions,
an :exc:`OSError` will be raised.
If ``replace`` is True, this will replace an existing kernel of the same
name. Otherwise, if the destination already exists, an :exc:`OSError`
will be raised.
"""
if not kernel_name:
kernel_name = os.path.basename(source_dir)
kernel_name = kernel_name.lower()
Thomas Kluyver
Make installation of native kernelspec explicit...
r17747
destination = self._get_destination_dir(kernel_name, system=system)
Thomas Kluyver
Add API function to install a kernelspec
r16559
if replace and os.path.isdir(destination):
shutil.rmtree(destination)
shutil.copytree(source_dir, destination)
Thomas Kluyver
Make installation of native kernelspec explicit...
r17747 def install_native_kernel_spec(self, system=False):
"""Install the native kernel spec to the filesystem
This allows a Python 3 frontend to use a Python 2 kernel, or vice versa.
The kernelspec will be written pointing to the Python executable on
which this is run.
If ``system`` is True, it will attempt to install into the systemwide
kernel registry. If the process does not have appropriate permissions,
an :exc:`OSError` will be raised.
"""
path = self._get_destination_dir(NATIVE_KERNEL_NAME, system=system)
os.makedirs(path, mode=0o755)
with open(pjoin(path, 'kernel.json'), 'w') as f:
json.dump(self._native_kernel_dict, f, indent=1)
# TODO: Copy icons into directory
return path
Thomas Kluyver
Rename list_kernel_specs to find_kernel_specs
r16276 def find_kernel_specs():
Thomas Kluyver
Better describe functions in kernelspec module
r16262 """Returns a dict mapping kernel names to resource directories."""
Thomas Kluyver
Allow IPython directory to be passed down to kernel selection from App...
r16382 return KernelSpecManager().find_kernel_specs()
Thomas Kluyver
First draft of new kernel registry machinery...
r16260
def get_kernel_spec(kernel_name):
Thomas Kluyver
Better describe functions in kernelspec module
r16262 """Returns a :class:`KernelSpec` instance for the given kernel_name.
Thomas Kluyver
First draft of new kernel registry machinery...
r16260
Raises KeyError if the given kernel name is not found.
"""
Thomas Kluyver
Add API function to install a kernelspec
r16559 return KernelSpecManager().get_kernel_spec(kernel_name)
Thomas Kluyver
Expose extra parameter on top-level function
r17103 def install_kernel_spec(source_dir, kernel_name=None, system=False, replace=False):
return KernelSpecManager().install_kernel_spec(source_dir, kernel_name,
system, replace)
Thomas Kluyver
Add API function to install a kernelspec
r16559
install_kernel_spec.__doc__ = KernelSpecManager.install_kernel_spec.__doc__
Thomas Kluyver
Make installation of native kernelspec explicit...
r17747
def install_native_kernel_spec(self, system=False):
return KernelSpecManager().install_native_kernel_spec(system=system)
Thomas Kluyver
Simplify kernel manager code
r17748 install_native_kernel_spec.__doc__ = KernelSpecManager.install_native_kernel_spec.__doc__