##// END OF EJS Templates
Merge pull request #8081 from takluyver/remove-pycrust-special-case...
Merge pull request #8081 from takluyver/remove-pycrust-special-case Remove _getAttributeNames special case for completion

File last commit:

r20316:233aefaf
r20810:56d0e131 merge
Show More
kernelspec.py
237 lines | 8.3 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
Min RK
Add KernelSpecManager.whitelist...
r20316 from IPython.utils.traitlets import HasTraits, List, Unicode, Dict, Any, Set
from IPython.config import Configurable
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:
Min RK
fix system-wide kernel path on Windows...
r19817 SYSTEM_KERNEL_DIRS = [pjoin(programdata, 'jupyter', '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
Store kernelspecs under jupyter, not IPython
r19519 SYSTEM_KERNEL_DIRS = ["/usr/share/jupyter/kernels",
"/usr/local/share/jupyter/kernels",
Thomas Kluyver
Also look in /usr/local/share/ipython/kernels
r16825 ]
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()
Min RK
s/language_name/language/
r20195 language = Unicode()
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()
@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):
Thomas Kluyver
Add pygments_lexer key to kernelspec
r18380 d = dict(argv=self.argv,
env=self.env,
display_name=self.display_name,
Min RK
s/language_name/language/
r20195 language=self.language,
Thomas Kluyver
Add pygments_lexer key to kernelspec
r18380 )
return d
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
Min RK
Add KernelSpecManager.whitelist...
r20316 class KernelSpecManager(Configurable):
Thomas Kluyver
Allow IPython directory to be passed down to kernel selection from App...
r16382 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
Add kernel directory relative to sys.prefix
r19520
@property
def env_kernel_dir(self):
return pjoin(sys.prefix, 'share', 'jupyter', 'kernels')
Thomas Kluyver
Better describe functions in kernelspec module
r16262
Min RK
Add KernelSpecManager.whitelist...
r20316 whitelist = Set(config=True,
help="""Whitelist of allowed kernel names.
By default, all installed kernels are allowed.
"""
)
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."
Min RK
Add KernelSpecManager.whitelist...
r20316 )
Thomas Kluyver
Allow IPython directory to be passed down to kernel selection from App...
r16382 def _kernel_dirs_default(self):
Thomas Kluyver
Add kernel directory relative to sys.prefix
r19520 dirs = SYSTEM_KERNEL_DIRS[:]
if self.env_kernel_dir not in dirs:
dirs.append(self.env_kernel_dir)
dirs.append(self.user_kernel_dir)
return dirs
Thomas Kluyver
Allow IPython directory to be passed down to kernel selection from App...
r16382
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
Min RK
use 'Python X' for IPython kernel display name...
r19763 process. This will put its information in the user kernels directory.
Thomas Kluyver
Allow IPython directory to be passed down to kernel selection from App...
r16382 """
Min RK
add project_name to kernelspec...
r20191 return {
'argv': make_ipkernel_cmd(),
Min RK
use 'Python X' for IPython kernel display name...
r19763 'display_name': 'Python %i' % (3 if PY3 else 2),
Min RK
s/language_name/language/
r20195 'language': 'python',
Thomas Kluyver
Move language info from kernelspec to kernel_info_reply
r18468 }
Thomas Kluyver
Make installation of native kernelspec explicit...
r17747
@property
def _native_kernel_resource_dir(self):
Thomas Kluyver
Initial support for supplying kernel logos in kernel spec
r19373 return pjoin(os.path.dirname(__file__), 'resources')
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 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
Min RK
Add KernelSpecManager.whitelist...
r20316 if self.whitelist:
# filter if there's a whitelist
d = {name:spec for name,spec in d.items() if name in self.whitelist}
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 """
Min RK
Add KernelSpecManager.whitelist...
r20316 if kernel_name in {'python', NATIVE_KERNEL_NAME} and \
(not self.whitelist or kernel_name in self.whitelist):
Thomas Kluyver
Initial support for supplying kernel logos in kernel spec
r19373 return KernelSpec(resource_dir=self._native_kernel_resource_dir,
**self._native_kernel_dict)
Thomas Kluyver
Make installation of native kernelspec explicit...
r17747
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
Thomas Kluyver
Default to systemwide installation for kernelspecs
r19522 def _get_destination_dir(self, kernel_name, user=False):
if user:
return os.path.join(self.user_kernel_dir, kernel_name)
else:
Thomas Kluyver
Make installation of native kernelspec explicit...
r17747 if SYSTEM_KERNEL_DIRS:
return os.path.join(SYSTEM_KERNEL_DIRS[-1], kernel_name)
else:
raise EnvironmentError("No system kernel directory is available")
Thomas Kluyver
Add supporting for making a directory for the native kernel
r16261
Thomas Kluyver
Default to systemwide installation for kernelspecs
r19522
def install_kernel_spec(self, source_dir, kernel_name=None, user=False,
Thomas Kluyver
Add API function to install a kernelspec
r16559 replace=False):
"""Install a kernel spec by copying its directory.
If ``kernel_name`` is not given, the basename of ``source_dir`` will
be used.
Doug Blank
Update kernelspec.py...
r19810 If ``user`` is False, it will attempt to install into the systemwide
Thomas Kluyver
Add API function to install a kernelspec
r16559 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
Thomas Kluyver
Default to systemwide installation for kernelspecs
r19522 destination = self._get_destination_dir(kernel_name, user=user)
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
Default to systemwide installation for kernelspecs
r19522 def install_native_kernel_spec(self, user=False):
Thomas Kluyver
Make installation of native kernelspec explicit...
r17747 """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.
Doug Blank
Update kernelspec.py...
r19810 If ``user`` is False, it will attempt to install into the systemwide
Thomas Kluyver
Make installation of native kernelspec explicit...
r17747 kernel registry. If the process does not have appropriate permissions,
an :exc:`OSError` will be raised.
"""
Thomas Kluyver
Default to systemwide installation for kernelspecs
r19522 path = self._get_destination_dir(NATIVE_KERNEL_NAME, user=user)
Thomas Kluyver
Make installation of native kernelspec explicit...
r17747 os.makedirs(path, mode=0o755)
with open(pjoin(path, 'kernel.json'), 'w') as f:
json.dump(self._native_kernel_dict, f, indent=1)
Thomas Kluyver
Initial support for supplying kernel logos in kernel spec
r19373 copy_from = self._native_kernel_resource_dir
for file in os.listdir(copy_from):
shutil.copy(pjoin(copy_from, file), path)
Thomas Kluyver
Make installation of native kernelspec explicit...
r17747 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
Default to systemwide installation for kernelspecs
r19522 def install_kernel_spec(source_dir, kernel_name=None, user=False, replace=False):
Thomas Kluyver
Expose extra parameter on top-level function
r17103 return KernelSpecManager().install_kernel_spec(source_dir, kernel_name,
Thomas Kluyver
Default to systemwide installation for kernelspecs
r19522 user, 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
Thomas Kluyver
Default to systemwide installation for kernelspecs
r19522 def install_native_kernel_spec(user=False):
return KernelSpecManager().install_native_kernel_spec(user=user)
Thomas Kluyver
Make installation of native kernelspec explicit...
r17747
Thomas Kluyver
Simplify kernel manager code
r17748 install_native_kernel_spec.__doc__ = KernelSpecManager.install_native_kernel_spec.__doc__