Hello community,
here is the log from the commit of package python-jupyter_ipykernel for
openSUSE:Factory checked in at 2015-10-12 10:02:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-jupyter_ipykernel (Old)
and /work/SRC/openSUSE:Factory/.python-jupyter_ipykernel.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-jupyter_ipykernel"
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-jupyter_ipykernel/python-jupyter_ipykernel.changes
2015-09-30 05:49:31.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.python-jupyter_ipykernel.new/python-jupyter_ipykernel.changes
2015-10-12 10:02:11.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Oct 8 10:34:53 UTC 2015 - [email protected]
+
+- Update to 4.1.0
+ * add ipython kernel install entrypoint for installing the IPython kernelspec
+ * provisional implementation of comm_info request/reply for msgspec v5.1
+
+-------------------------------------------------------------------
Old:
----
ipykernel-4.0.3.tar.gz
New:
----
ipykernel-4.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-jupyter_ipykernel.spec ++++++
--- /var/tmp/diff_new_pack.hachRU/_old 2015-10-12 10:02:12.000000000 +0200
+++ /var/tmp/diff_new_pack.hachRU/_new 2015-10-12 10:02:12.000000000 +0200
@@ -17,7 +17,7 @@
Name: python-jupyter_ipykernel
-Version: 4.0.3
+Version: 4.1.0
Release: 0
Summary: IPython Kernel for Jupyter
License: BSD-3-Clause
++++++ ipykernel-4.0.3.tar.gz -> ipykernel-4.1.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/PKG-INFO new/ipykernel-4.1.0/PKG-INFO
--- old/ipykernel-4.0.3/PKG-INFO 2015-08-12 03:13:10.000000000 +0200
+++ new/ipykernel-4.1.0/PKG-INFO 2015-10-07 13:33:48.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: ipykernel
-Version: 4.0.3
+Version: 4.1.0
Summary: IPython Kernel for Jupyter
Home-page: http://ipython.org
Author: IPython Development Team
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/README.md
new/ipykernel-4.1.0/README.md
--- old/ipykernel-4.0.3/README.md 2015-08-04 21:13:39.000000000 +0200
+++ new/ipykernel-4.1.0/README.md 2015-08-22 01:51:10.000000000 +0200
@@ -6,9 +6,6 @@
1. `git clone`
2. `cd ipykernel`
-3. `pip install --pre -e .`
-
-
-The `--pre` will only be needed while we haven't released IPython 4. Once
that's done, it will never be needed again. `--pre` isn't needed if you already
have IPython from master.
+3. `pip install -e .`
After that, all normal `ipython` commands will use this newly-installed
version of the kernel.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/docs/Makefile
new/ipykernel-4.1.0/docs/Makefile
--- old/ipykernel-4.0.3/docs/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ new/ipykernel-4.1.0/docs/Makefile 2015-10-07 13:27:53.000000000 +0200
@@ -0,0 +1,192 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS =
+SPHINXBUILD = sphinx-build
+PAPER =
+BUILDDIR = _build
+
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx
installed, then set the SPHINXBUILD environment variable to point to the full
path of the '$(SPHINXBUILD)' executable. Alternatively you can add the
directory with the executable to your PATH. If you don't have Sphinx installed,
grab it from http://sphinx-doc.org/)
+endif
+
+# Internal variables.
+PAPEROPT_a4 = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp
epub latex latexpdf text man changes linkcheck doctest coverage gettext
+
+help:
+ @echo "Please use \`make <target>' where <target> is one of"
+ @echo " html to make standalone HTML files"
+ @echo " dirhtml to make HTML files named index.html in directories"
+ @echo " singlehtml to make a single large HTML file"
+ @echo " pickle to make pickle files"
+ @echo " json to make JSON files"
+ @echo " htmlhelp to make HTML files and a HTML help project"
+ @echo " qthelp to make HTML files and a qthelp project"
+ @echo " applehelp to make an Apple Help Book"
+ @echo " devhelp to make HTML files and a Devhelp project"
+ @echo " epub to make an epub"
+ @echo " latex to make LaTeX files, you can set PAPER=a4 or
PAPER=letter"
+ @echo " latexpdf to make LaTeX files and run them through pdflatex"
+ @echo " latexpdfja to make LaTeX files and run them through
platex/dvipdfmx"
+ @echo " text to make text files"
+ @echo " man to make manual pages"
+ @echo " texinfo to make Texinfo files"
+ @echo " info to make Texinfo files and run them through makeinfo"
+ @echo " gettext to make PO message catalogs"
+ @echo " changes to make an overview of all changed/added/deprecated
items"
+ @echo " xml to make Docutils-native XML files"
+ @echo " pseudoxml to make pseudoxml-XML files for display purposes"
+ @echo " linkcheck to check all external links for integrity"
+ @echo " doctest to run all doctests embedded in the documentation
(if enabled)"
+ @echo " coverage to run coverage check of the documentation (if
enabled)"
+
+clean:
+ rm -rf $(BUILDDIR)/*
+
+html:
+ $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+ $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+ $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+ @echo
+ @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+ $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+ @echo
+ @echo "Build finished; now you can process the pickle files."
+
+json:
+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+ @echo
+ @echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+ @echo
+ @echo "Build finished; now you can run HTML Help Workshop with the" \
+ ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+ @echo
+ @echo "Build finished; now you can run "qcollectiongenerator" with the"
\
+ ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+ @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/IPythonKernel.qhcp"
+ @echo "To view the help file:"
+ @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/IPythonKernel.qhc"
+
+applehelp:
+ $(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
+ @echo
+ @echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
+ @echo "N.B. You won't be able to view it unless you put it in" \
+ "~/Library/Documentation/Help or install it in your application" \
+ "bundle."
+
+devhelp:
+ $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+ @echo
+ @echo "Build finished."
+ @echo "To view the help file:"
+ @echo "# mkdir -p $$HOME/.local/share/devhelp/IPythonKernel"
+ @echo "# ln -s $(BUILDDIR)/devhelp
$$HOME/.local/share/devhelp/IPythonKernel"
+ @echo "# devhelp"
+
+epub:
+ $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+ @echo
+ @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo
+ @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+ @echo "Run \`make' in that directory to run these through (pdf)latex" \
+ "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo "Running LaTeX files through pdflatex..."
+ $(MAKE) -C $(BUILDDIR)/latex all-pdf
+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+latexpdfja:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo "Running LaTeX files through platex and dvipdfmx..."
+ $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+ $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+ @echo
+ @echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+ $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+ @echo
+ @echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+ @echo
+ @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+ @echo "Run \`make' in that directory to run these through makeinfo" \
+ "(use \`make info' here to do that automatically)."
+
+info:
+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+ @echo "Running Texinfo files through makeinfo..."
+ make -C $(BUILDDIR)/texinfo info
+ @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+ $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+ @echo
+ @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+ $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+ @echo
+ @echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+ @echo
+ @echo "Link check complete; look for any errors in the above output " \
+ "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+ $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+ @echo "Testing of doctests in the sources finished, look at the " \
+ "results in $(BUILDDIR)/doctest/output.txt."
+
+coverage:
+ $(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+ @echo "Testing of coverage in the sources finished, look at the " \
+ "results in $(BUILDDIR)/coverage/python.txt."
+
+xml:
+ $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+ @echo
+ @echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+ $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+ @echo
+ @echo "Build finished. The pseudo-XML files are in
$(BUILDDIR)/pseudoxml."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/docs/changelog.rst
new/ipykernel-4.1.0/docs/changelog.rst
--- old/ipykernel-4.0.3/docs/changelog.rst 1970-01-01 01:00:00.000000000
+0100
+++ new/ipykernel-4.1.0/docs/changelog.rst 2015-10-07 13:27:53.000000000
+0200
@@ -0,0 +1,19 @@
+Changes in IPython kernel
+=========================
+
+4.1
+---
+
+`4.1 on GitHub <https://github.com/ipython/ipykernel/milestones/4.1>`_
+
+- add ``ipython kernel install`` entrypoint for installing the IPython
+ kernelspec
+- provisional implementation of ``comm_info`` request/reply for msgspec
+ v5.1
+
+4.0
+---
+
+`4.0 on GitHub <https://github.com/ipython/ipykernel/milestones/4.0>`_
+
+4.0 is the first release of ipykernel as a standalone package.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/docs/conf.py
new/ipykernel-4.1.0/docs/conf.py
--- old/ipykernel-4.0.3/docs/conf.py 1970-01-01 01:00:00.000000000 +0100
+++ new/ipykernel-4.1.0/docs/conf.py 2015-10-07 13:27:53.000000000 +0200
@@ -0,0 +1,303 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# IPython Kernel documentation build configuration file, created by
+# sphinx-quickstart on Mon Oct 5 11:32:44 2015.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys
+import os
+import shlex
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+ 'sphinx.ext.autodoc',
+ 'sphinx.ext.intersphinx',
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = 'IPython Kernel'
+copyright = '2015, IPython Development Team'
+author = 'IPython Development Team'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+
+version_ns = {}
+here = os.path.dirname(__file__)
+version_py = os.path.join(here, os.pardir, 'ipykernel', '_version.py')
+with open(version_py) as f:
+ exec(compile(f.read(), version_py, 'exec'), version_ns)
+
+# The short X.Y version.
+version = '%i.%i' % version_ns['version_info'][:2]
+# The full version, including alpha/beta/rc tags.
+release = version_ns['__version__']
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages. See the documentation for
+# a list of builtin themes.
+# html_theme = 'alabaster'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further. For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents. If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar. Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#html_extra_path = []
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it. The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Language to be used for generating the HTML full-text search index.
+# Sphinx supports the following languages:
+# 'da', 'de', 'en', 'es', 'fi', 'fr', 'h', 'it', 'ja'
+# 'nl', 'no', 'pt', 'ro', 'r', 'sv', 'tr'
+#html_search_language = 'en'
+
+# A dictionary with options for the search language support, empty by default.
+# Now only 'ja' uses this config value
+#html_search_options = {'type': 'default'}
+
+# The name of a javascript file (relative to the configuration directory) that
+# implements a search results scorer. If empty, the default will be used.
+#html_search_scorer = 'scorer.js'
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'ipykerneldoc'
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+
+# Latex figure (float) alignment
+#'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+# author, documentclass [howto, manual, or own class]).
+latex_documents = [
+ (master_doc, 'ipykernel.tex', 'IPython Kernel Documentation',
+ 'IPython Development Team', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+ (master_doc, 'ipykernel', 'IPython Kernel Documentation',
+ [author], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+# dir menu entry, description, category)
+texinfo_documents = [
+ (master_doc, 'ipykernel', 'IPython Kernel Documentation',
+ author, 'ipykernel', 'One line description of project.',
+ 'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#texinfo_no_detailmenu = False
+
+
+# Example configuration for intersphinx: refer to the Python standard library.
+intersphinx_mapping = {
+ 'https://docs.python.org/': None,
+ 'ipython': ('https://ipython.readthedocs.org/en/latest', None),
+ 'jupyter': ('https://jupyter.readthedocs.org/en/latest', None),
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/docs/index.rst
new/ipykernel-4.1.0/docs/index.rst
--- old/ipykernel-4.0.3/docs/index.rst 1970-01-01 01:00:00.000000000 +0100
+++ new/ipykernel-4.1.0/docs/index.rst 2015-10-07 13:27:53.000000000 +0200
@@ -0,0 +1,23 @@
+.. _index:
+
+IPython Kernel Docs
+===================
+
+This contains minimal version-sensitive documentation for the IPython kernel
package.
+Most IPython kernel documentation is in the `IPython documentation
<http://ipython.readthedocs.org/en/latest/>`_.
+
+Contents:
+
+.. toctree::
+ :maxdepth: 2
+
+ changelog.rst
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/docs/make.bat
new/ipykernel-4.1.0/docs/make.bat
--- old/ipykernel-4.0.3/docs/make.bat 1970-01-01 01:00:00.000000000 +0100
+++ new/ipykernel-4.1.0/docs/make.bat 2015-10-07 13:27:53.000000000 +0200
@@ -0,0 +1,263 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+ set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=_build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
+set I18NSPHINXOPTS=%SPHINXOPTS% .
+if NOT "%PAPER%" == "" (
+ set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+ set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+ :help
+ echo.Please use `make ^<target^>` where ^<target^> is one of
+ echo. html to make standalone HTML files
+ echo. dirhtml to make HTML files named index.html in directories
+ echo. singlehtml to make a single large HTML file
+ echo. pickle to make pickle files
+ echo. json to make JSON files
+ echo. htmlhelp to make HTML files and a HTML help project
+ echo. qthelp to make HTML files and a qthelp project
+ echo. devhelp to make HTML files and a Devhelp project
+ echo. epub to make an epub
+ echo. latex to make LaTeX files, you can set PAPER=a4 or
PAPER=letter
+ echo. text to make text files
+ echo. man to make manual pages
+ echo. texinfo to make Texinfo files
+ echo. gettext to make PO message catalogs
+ echo. changes to make an overview over all changed/added/deprecated
items
+ echo. xml to make Docutils-native XML files
+ echo. pseudoxml to make pseudoxml-XML files for display purposes
+ echo. linkcheck to check all external links for integrity
+ echo. doctest to run all doctests embedded in the documentation if
enabled
+ echo. coverage to run coverage check of the documentation if enabled
+ goto end
+)
+
+if "%1" == "clean" (
+ for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+ del /q /s %BUILDDIR%\*
+ goto end
+)
+
+
+REM Check if sphinx-build is available and fallback to Python version if any
+%SPHINXBUILD% 2> nul
+if errorlevel 9009 goto sphinx_python
+goto sphinx_ok
+
+:sphinx_python
+
+set SPHINXBUILD=python -m sphinx.__init__
+%SPHINXBUILD% 2> nul
+if errorlevel 9009 (
+ echo.
+ echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+ echo.installed, then set the SPHINXBUILD environment variable to point
+ echo.to the full path of the 'sphinx-build' executable. Alternatively
you
+ echo.may add the Sphinx directory to PATH.
+ echo.
+ echo.If you don't have Sphinx installed, grab it from
+ echo.http://sphinx-doc.org/
+ exit /b 1
+)
+
+:sphinx_ok
+
+
+if "%1" == "html" (
+ %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+ goto end
+)
+
+if "%1" == "dirhtml" (
+ %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+ goto end
+)
+
+if "%1" == "singlehtml" (
+ %SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
+ goto end
+)
+
+if "%1" == "pickle" (
+ %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished; now you can process the pickle files.
+ goto end
+)
+
+if "%1" == "json" (
+ %SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished; now you can process the JSON files.
+ goto end
+)
+
+if "%1" == "htmlhelp" (
+ %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+ goto end
+)
+
+if "%1" == "qthelp" (
+ %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+ echo.^> qcollectiongenerator %BUILDDIR%\qthelp\IPythonKernel.qhcp
+ echo.To view the help file:
+ echo.^> assistant -collectionFile %BUILDDIR%\qthelp\IPythonKernel.ghc
+ goto end
+)
+
+if "%1" == "devhelp" (
+ %SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished.
+ goto end
+)
+
+if "%1" == "epub" (
+ %SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The epub file is in %BUILDDIR%/epub.
+ goto end
+)
+
+if "%1" == "latex" (
+ %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+ goto end
+)
+
+if "%1" == "latexpdf" (
+ %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+ cd %BUILDDIR%/latex
+ make all-pdf
+ cd %~dp0
+ echo.
+ echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+ goto end
+)
+
+if "%1" == "latexpdfja" (
+ %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+ cd %BUILDDIR%/latex
+ make all-pdf-ja
+ cd %~dp0
+ echo.
+ echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+ goto end
+)
+
+if "%1" == "text" (
+ %SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The text files are in %BUILDDIR%/text.
+ goto end
+)
+
+if "%1" == "man" (
+ %SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The manual pages are in %BUILDDIR%/man.
+ goto end
+)
+
+if "%1" == "texinfo" (
+ %SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
+ goto end
+)
+
+if "%1" == "gettext" (
+ %SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
+ goto end
+)
+
+if "%1" == "changes" (
+ %SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.The overview file is in %BUILDDIR%/changes.
+ goto end
+)
+
+if "%1" == "linkcheck" (
+ %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+ goto end
+)
+
+if "%1" == "doctest" (
+ %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+ goto end
+)
+
+if "%1" == "coverage" (
+ %SPHINXBUILD% -b coverage %ALLSPHINXOPTS% %BUILDDIR%/coverage
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Testing of coverage in the sources finished, look at the ^
+results in %BUILDDIR%/coverage/python.txt.
+ goto end
+)
+
+if "%1" == "xml" (
+ %SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The XML files are in %BUILDDIR%/xml.
+ goto end
+)
+
+if "%1" == "pseudoxml" (
+ %SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
+ goto end
+)
+
+:end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ipykernel-4.0.3/examples/Embedding/internal_ipkernel.py
new/ipykernel-4.1.0/examples/Embedding/internal_ipkernel.py
--- old/ipykernel-4.0.3/examples/Embedding/internal_ipkernel.py 2015-04-11
19:03:05.000000000 +0200
+++ new/ipykernel-4.1.0/examples/Embedding/internal_ipkernel.py 2015-09-22
09:39:51.000000000 +0200
@@ -45,7 +45,7 @@
def new_qt_console(self, evt=None):
"""start a new qtconsole connected to our kernel"""
- return connect_qtconsole(self.ipkernel.connection_file,
profile=self.ipkernel.profile)
+ return connect_qtconsole(self.ipkernel.abs_connection_file,
profile=self.ipkernel.profile)
def count(self, evt=None):
self.namespace['app_counter'] += 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/ipykernel/__init__.py
new/ipykernel-4.1.0/ipykernel/__init__.py
--- old/ipykernel-4.0.3/ipykernel/__init__.py 2015-05-08 22:15:04.000000000
+0200
+++ new/ipykernel-4.1.0/ipykernel/__init__.py 2015-09-24 11:30:15.000000000
+0200
@@ -1,2 +1,2 @@
-from ._version import version_info, __version__
+from ._version import *
from .connect import *
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/ipykernel/_version.py
new/ipykernel-4.1.0/ipykernel/_version.py
--- old/ipykernel-4.0.3/ipykernel/_version.py 2015-08-12 03:12:27.000000000
+0200
+++ new/ipykernel-4.1.0/ipykernel/_version.py 2015-10-07 13:28:31.000000000
+0200
@@ -1,2 +1,5 @@
-version_info = (4, 0, 3)
+version_info = (4, 1, 0)
__version__ = '.'.join(map(str, version_info))
+
+kernel_protocol_version_info = (5, 0)
+kernel_protocol_version = '%s.%s' % kernel_protocol_version_info
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/ipykernel/comm/manager.py
new/ipykernel-4.1.0/ipykernel/comm/manager.py
--- old/ipykernel-4.0.3/ipykernel/comm/manager.py 2015-05-08
22:15:04.000000000 +0200
+++ new/ipykernel-4.1.0/ipykernel/comm/manager.py 2015-09-04
17:46:03.000000000 +0200
@@ -87,7 +87,7 @@
it will log messages if the comm cannot be found.
"""
if comm_id not in self.comms:
- self.log.error("No such comm: %s", comm_id)
+ self.log.warn("No such comm: %s", comm_id)
self.log.debug("Current comms: %s", lazy_keys(self.comms))
return
# call, because we store weakrefs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/ipykernel/datapub.py
new/ipykernel-4.1.0/ipykernel/datapub.py
--- old/ipykernel-4.0.3/ipykernel/datapub.py 2015-05-08 22:15:04.000000000
+0200
+++ new/ipykernel-4.1.0/ipykernel/datapub.py 2015-10-05 11:27:35.000000000
+0200
@@ -5,8 +5,7 @@
# Distributed under the terms of the Modified BSD License.
from traitlets.config import Configurable
-from ipykernel.inprocess.socket import SocketABC
-from traitlets import Instance, Dict, CBytes
+from traitlets import Instance, Dict, CBytes, Any
from ipykernel.jsonutil import json_clean
from ipykernel.serialize import serialize_object
from jupyter_client.session import Session, extract_header
@@ -16,7 +15,7 @@
topic = topic = CBytes(b'datapub')
session = Instance(Session, allow_none=True)
- pub_socket = Instance(SocketABC, allow_none=True)
+ pub_socket = Any(allow_none=True)
parent_header = Dict({})
def set_parent(self, parent):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/ipykernel/displayhook.py
new/ipykernel-4.1.0/ipykernel/displayhook.py
--- old/ipykernel-4.0.3/ipykernel/displayhook.py 2015-05-08
22:15:04.000000000 +0200
+++ new/ipykernel-4.1.0/ipykernel/displayhook.py 2015-10-05
11:27:35.000000000 +0200
@@ -6,10 +6,9 @@
import sys
from IPython.core.displayhook import DisplayHook
-from ipykernel.inprocess.socket import SocketABC
from ipykernel.jsonutil import encode_images
from ipython_genutils.py3compat import builtin_mod
-from traitlets import Instance, Dict
+from traitlets import Instance, Dict, Any
from jupyter_client.session import extract_header, Session
class ZMQDisplayHook(object):
@@ -43,7 +42,7 @@
topic=None
session = Instance(Session, allow_none=True)
- pub_socket = Instance(SocketABC, allow_none=True)
+ pub_socket = Any(allow_none=True)
parent_header = Dict({})
def set_parent(self, parent):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/ipykernel/inprocess/client.py
new/ipykernel-4.1.0/ipykernel/inprocess/client.py
--- old/ipykernel-4.0.3/ipykernel/inprocess/client.py 2015-08-04
21:13:38.000000000 +0200
+++ new/ipykernel-4.1.0/ipykernel/inprocess/client.py 2015-09-17
13:36:50.000000000 +0200
@@ -50,9 +50,18 @@
#--------------------------------------------------------------------------
# Channel management methods
#--------------------------------------------------------------------------
+
+ def _blocking_class_default(self):
+ from .blocking import BlockingInProcessKernelClient
+ return BlockingInProcessKernelClient
+
+ def get_connection_info(self):
+ d = super(InProcessKernelClient, self).get_connection_info()
+ d['kernel'] = self.kernel
+ return d
def start_channels(self, *args, **kwargs):
- super(InProcessKernelClient, self).start_channels(self)
+ super(InProcessKernelClient, self).start_channels()
self.kernel.frontends.append(self)
@property
@@ -128,11 +137,25 @@
self._dispatch_to_kernel(msg)
return msg['header']['msg_id']
+ def comm_info(self, target_name=None):
+ """Request a dictionary of valid comms and their targets."""
+ if target_name is None:
+ content = {}
+ else:
+ content = dict(target_name=target_name)
+ msg = self.session.msg('comm_info_request', content)
+ self._dispatch_to_kernel(msg)
+ return msg['header']['msg_id']
+
def input(self, string):
if self.kernel is None:
raise RuntimeError('Cannot send input reply. No kernel exists.')
self.kernel.raw_input_str = string
+ def is_complete(self, code):
+ msg = self.session.msg('is_complete_request', {'code': code})
+ self._dispatch_to_kernel(msg)
+ return msg['header']['msg_id']
def _dispatch_to_kernel(self, msg):
""" Send a message to the kernel and handle a reply.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/ipykernel/inprocess/manager.py
new/ipykernel-4.1.0/ipykernel/inprocess/manager.py
--- old/ipykernel-4.0.3/ipykernel/inprocess/manager.py 2015-08-04
21:13:38.000000000 +0200
+++ new/ipykernel-4.1.0/ipykernel/inprocess/manager.py 2015-09-17
13:36:50.000000000 +0200
@@ -24,6 +24,9 @@
allow_none=True)
# the client class for KM.client() shortcut
client_class =
DottedObjectName('ipykernel.inprocess.BlockingInProcessKernelClient')
+ def _blocking_class_default(self):
+ from .blocking import BlockingInProcessKernelClient
+ return BlockingInProcessKernelClient
def _session_default(self):
# don't sign in-process messages
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/ipykernel/inprocess/socket.py
new/ipykernel-4.1.0/ipykernel/inprocess/socket.py
--- old/ipykernel-4.0.3/ipykernel/inprocess/socket.py 2015-05-08
22:15:04.000000000 +0200
+++ new/ipykernel-4.1.0/ipykernel/inprocess/socket.py 2015-10-05
11:27:35.000000000 +0200
@@ -1,27 +1,17 @@
""" Defines a dummy socket implementing (part of) the zmq.Socket interface. """
-#-----------------------------------------------------------------------------
-# Copyright (C) 2012 The IPython Development Team
-#
-# Distributed under the terms of the BSD License. The full license is in
-# the file COPYING, distributed as part of this software.
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
-# Standard library imports.
import abc
+import warnings
try:
from queue import Queue # Py 3
except ImportError:
from Queue import Queue # Py 2
-# System library imports.
import zmq
-# Local imports.
from traitlets import HasTraits, Instance, Int
from ipython_genutils.py3compat import with_metaclass
@@ -30,6 +20,7 @@
#-----------------------------------------------------------------------------
class SocketABC(with_metaclass(abc.ABCMeta, object)):
+
@abc.abstractmethod
def recv_multipart(self, flags=0, copy=True, track=False):
raise NotImplementedError
@@ -37,8 +28,11 @@
@abc.abstractmethod
def send_multipart(self, msg_parts, flags=0, copy=True, track=False):
raise NotImplementedError
-
-SocketABC.register(zmq.Socket)
+
+ @classmethod
+ def register(cls, other_cls):
+ warnings.warn("SocketABC is deprecated.", DeprecationWarning)
+ abc.ABCMeta.register(cls, other_cls)
#-----------------------------------------------------------------------------
# Dummy socket class
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/ipykernel/kernelapp.py
new/ipykernel-4.1.0/ipykernel/kernelapp.py
--- old/ipykernel-4.0.3/ipykernel/kernelapp.py 2015-08-04 21:13:39.000000000
+0200
+++ new/ipykernel-4.1.0/ipykernel/kernelapp.py 2015-09-17 13:36:50.000000000
+0200
@@ -111,13 +111,18 @@
poller = Any() # don't restrict this even though current pollers are all
Threads
heartbeat = Instance(Heartbeat, allow_none=True)
ports = Dict()
+
+ subcommands = {
+ 'install': (
+ 'ipykernel.kernelspec.InstallIPythonKernelSpecApp',
+ 'Install the IPython kernel'
+ ),
+ }
# connection info:
connection_dir = Unicode()
def _connection_dir_default(self):
- d = jupyter_runtime_dir()
- ensure_dir_exists(d, 0o700)
- return d
+ return jupyter_runtime_dir()
@property
def abs_connection_file(self):
@@ -201,7 +206,9 @@
self.connection_file = filefind(self.connection_file, ['.',
self.connection_dir])
except IOError:
self.log.debug("Connection file not found: %s",
self.connection_file)
- # This means I own it, so I will clean it up:
+ # This means I own it, and I'll create it in this directory:
+ ensure_dir_exists(os.path.dirname(self.abs_connection_file), 0o700)
+ # Also, I will clean it up:
atexit.register(self.cleanup_connection_file)
return
try:
@@ -358,14 +365,18 @@
@catch_config_error
def initialize(self, argv=None):
super(IPKernelApp, self).initialize(argv)
+ if self.subapp is not None:
+ return
self.init_blackhole()
self.init_connection_file()
self.init_poller()
self.init_sockets()
self.init_heartbeat()
# writing/displaying connection info must be *after*
init_sockets/heartbeat
- self.log_connection_info()
self.write_connection_file()
+ # Log connection info after writing connection file, so that the
connection
+ # file is definitely available at the time someone reads the log.
+ self.log_connection_info()
self.init_io()
self.init_signal()
self.init_kernel()
@@ -382,6 +393,9 @@
sys.stderr.flush()
def start(self):
+ if self.subapp is not None:
+ return self.subapp.start()
+
if self.poller is not None:
self.poller.start()
self.kernel.start()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/ipykernel/kernelbase.py
new/ipykernel-4.1.0/ipykernel/kernelbase.py
--- old/ipykernel-4.0.3/ipykernel/kernelbase.py 2015-07-05 22:30:47.000000000
+0200
+++ new/ipykernel-4.1.0/ipykernel/kernelbase.py 2015-09-29 10:58:30.000000000
+0200
@@ -21,7 +21,6 @@
from traitlets.config.configurable import SingletonConfigurable
from IPython.core.error import StdinNotImplementedError
-from IPython.core import release
from ipython_genutils import py3compat
from ipython_genutils.py3compat import unicode_type, string_types
from ipykernel.jsonutil import json_clean
@@ -31,6 +30,7 @@
from jupyter_client.session import Session
+from ._version import kernel_protocol_version
class Kernel(SingletonConfigurable):
@@ -119,7 +119,7 @@
# Build dict of handlers for message types
msg_types = [ 'execute_request', 'complete_request',
'inspect_request', 'history_request',
- 'kernel_info_request',
+ 'comm_info_request', 'kernel_info_request',
'connect_request', 'shutdown_request',
'apply_request', 'is_complete_request',
]
@@ -206,20 +206,28 @@
if handler is None:
self.log.error("UNKNOWN MESSAGE TYPE: %r", msg_type)
else:
- # ensure default_int_handler during handler call
- sig = signal(SIGINT, default_int_handler)
self.log.debug("%s: %s", msg_type, msg)
+ self.pre_handler_hook()
try:
handler(stream, idents, msg)
except Exception:
self.log.error("Exception in message handler:", exc_info=True)
finally:
- signal(SIGINT, sig)
+ self.post_handler_hook()
sys.stdout.flush()
sys.stderr.flush()
self._publish_status(u'idle')
+ def pre_handler_hook(self):
+ """Hook to execute before calling message handler"""
+ # ensure default_int_handler during handler call
+ self.saved_sigint_handler = signal(SIGINT, default_int_handler)
+
+ def post_handler_hook(self):
+ """Hook to execute after calling message handler"""
+ signal(SIGINT, self.saved_sigint_handler)
+
def enter_eventloop(self):
"""enter eventloop"""
self.log.info("entering eventloop %s", self.eventloop)
@@ -427,7 +435,7 @@
def do_inspect(self, code, cursor_pos, detail_level=0):
"""Override in subclasses to allow introspection.
"""
- return {'status': 'ok', 'data':{}, 'metadata':{}, 'found':False}
+ return {'status': 'ok', 'data': {}, 'metadata': {}, 'found': False}
def history_request(self, stream, ident, parent):
content = parent['content']
@@ -457,7 +465,7 @@
@property
def kernel_info(self):
return {
- 'protocol_version': release.kernel_protocol_version,
+ 'protocol_version': kernel_protocol_version,
'implementation': self.implementation,
'implementation_version': self.implementation_version,
'language_info': self.language_info,
@@ -470,6 +478,24 @@
self.kernel_info, parent, ident)
self.log.debug("%s", msg)
+ def comm_info_request(self, stream, ident, parent):
+ content = parent['content']
+ target_name = content.get('target_name', None)
+
+ # Should this be moved to ipkernel?
+ if hasattr(self, 'comm_manager'):
+ comms = {
+ k: dict(target_name=v.target_name)
+ for (k, v) in self.comm_manager.comms.items()
+ if v.target_name == target_name or target_name is None
+ }
+ else:
+ comms = {}
+ reply_content = dict(comms=comms)
+ msg = self.session.send(stream, 'comm_info_reply',
+ reply_content, parent, ident)
+ self.log.debug("%s", msg)
+
def shutdown_request(self, stream, ident, parent):
content = self.do_shutdown(parent['content']['restart'])
self.session.send(stream, u'shutdown_reply', content, parent,
ident=ident)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/ipykernel/kernelspec.py
new/ipykernel-4.1.0/ipykernel/kernelspec.py
--- old/ipykernel-4.0.3/ipykernel/kernelspec.py 2015-07-10 06:42:04.000000000
+0200
+++ new/ipykernel-4.1.0/ipykernel/kernelspec.py 2015-09-22 09:39:51.000000000
+0200
@@ -3,6 +3,9 @@
# Copyright (c) IPython Development Team.
# Distributed under the terms of the Modified BSD License.
+from __future__ import print_function
+
+import errno
import json
import os
import shutil
@@ -55,10 +58,11 @@
}
-def write_kernel_spec(path=None):
+def write_kernel_spec(path=None, overrides=None):
"""Write a kernel spec directory to `path`
If `path` is not specified, a temporary directory is created.
+ If `overrides` is given, the kernelspec JSON is updated before writing.
The path to the kernelspec is always returned.
"""
@@ -68,13 +72,16 @@
# stage resources
shutil.copytree(RESOURCES, path)
# write kernel.json
+ kernel_dict = get_kernel_dict()
+ if overrides:
+ kernel_dict.update(overrides)
with open(pjoin(path, 'kernel.json'), 'w') as f:
- json.dump(get_kernel_dict(), f, indent=1)
+ json.dump(kernel_dict, f, indent=1)
return path
-def install(kernel_spec_manager=None, user=False, kernel_name=None,
prefix=None):
+def install(kernel_spec_manager=None, user=False, kernel_name=None,
display_name=None, prefix=None):
"""Install the IPython kernelspec for Jupyter
Parameters
@@ -91,6 +98,8 @@
prefix: str, optional
Specify an install prefix for the kernelspec.
This is needed to install into a non-default location, such as a
conda/virtual-env.
+ display_name: str, optional
+ Specify the display name for the kernelspec
Returns
-------
@@ -101,27 +110,60 @@
kernel_spec_manager = KernelSpecManager()
if kernel_name is None:
kernel_name = KERNEL_NAME
- path = write_kernel_spec()
+ if display_name:
+ overrides = dict(display_name=display_name)
+ else:
+ overrides = None
+ path = write_kernel_spec(overrides=overrides)
dest = kernel_spec_manager.install_kernel_spec(path,
kernel_name=kernel_name, user=user, prefix=prefix)
# cleanup afterward
shutil.rmtree(path)
return dest
+# Entrypoint
+
+from traitlets.config import Application
+
+
+class InstallIPythonKernelSpecApp(Application):
+ """Dummy app wrapping argparse"""
+ name = 'ipython-kernel-install'
+
+ def initialize(self, argv=None):
+ if argv is None:
+ argv = sys.argv[1:]
+ self.argv = argv
+
+ def start(self):
+ import argparse
+ parser = argparse.ArgumentParser(
+ description="Install the IPython kernel spec.")
+ parser.add_argument('--user', action='store_true',
+ help="Install for the current user instead of system-wide")
+ parser.add_argument('--name', type=str, default=KERNEL_NAME,
+ help="Specify a name for the kernelspec."
+ " This is needed to have multiple IPython kernels at the same
time.")
+ parser.add_argument('--display-name', type=str,
+ help="Specify the display name for the kernelspec."
+ " This is helpful when you have multiple IPython kernels.")
+ parser.add_argument('--prefix', type=str,
+ help="Specify an install prefix for the kernelspec."
+ " This is needed to install into a non-default location, such as a
conda/virtual-env.")
+ opts = parser.parse_args(self.argv)
+ try:
+ dest = install(user=opts.user, kernel_name=opts.name,
prefix=opts.prefix,
+ display_name=opts.display_name,
+ )
+ except OSError as e:
+ if e.errno == errno.EACCES:
+ print(e, file=sys.stderr)
+ if opts.user:
+ print("Perhaps you want `sudo` or `--user`?",
file=sys.stderr)
+ self.exit(1)
+ raise
+ print("Installed kernelspec %s in %s" % (opts.name, dest))
+
if __name__ == '__main__':
- import argparse
- parser = argparse.ArgumentParser(
- description="Install the IPython kernel spec.")
- parser.add_argument('--user', action='store_true',
- help="Install for the current user instead of system-wide")
- parser.add_argument('--name', type=str, default=KERNEL_NAME,
- help="Specify a name for the kernelspec."
- " This is needed to have multiple IPython kernels at the same time.")
- parser.add_argument('--prefix', type=str,
- help="Specify an install prefix for the kernelspec."
- " This is needed to install into a non-default location, such as a
conda/virtual-env.")
- opts = parser.parse_args()
-
- dest = install(user=opts.user, kernel_name=opts.name, prefix=opts.prefix)
- print("Installed kernelspec %s in %s" % (opts.name, dest))
+ InstallIPythonKernelSpecApp.launch_instance()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/ipykernel/pickleutil.py
new/ipykernel-4.1.0/ipykernel/pickleutil.py
--- old/ipykernel-4.0.3/ipykernel/pickleutil.py 2015-05-08 22:15:04.000000000
+0200
+++ new/ipykernel-4.1.0/ipykernel/pickleutil.py 2015-09-29 10:58:30.000000000
+0200
@@ -16,7 +16,7 @@
from ipython_genutils import py3compat
from ipython_genutils.importstring import import_item
-from ipython_genutils.py3compat import string_types, iteritems,
buffer_to_bytes_py2
+from ipython_genutils.py3compat import string_types, iteritems,
buffer_to_bytes, buffer_to_bytes_py2
from . import codeutil # This registers a hook when it's imported
@@ -290,7 +290,8 @@
class CannedBytes(CannedObject):
- wrap = bytes
+ wrap = staticmethod(buffer_to_bytes)
+
def __init__(self, obj):
self.buffers = [obj]
@@ -439,6 +440,7 @@
uncan_map = {
CannedObject : lambda obj, g: obj.get_object(g),
+ dict : uncan_dict,
}
# for use in _import_mapping:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/ipykernel/pylab/backend_inline.py
new/ipykernel-4.1.0/ipykernel/pylab/backend_inline.py
--- old/ipykernel-4.0.3/ipykernel/pylab/backend_inline.py 2015-05-08
22:15:04.000000000 +0200
+++ new/ipykernel-4.1.0/ipykernel/pylab/backend_inline.py 2015-09-29
10:58:32.000000000 +0200
@@ -15,7 +15,7 @@
from .config import InlineBackend
-def show(close=None):
+def show(close=None, block=None):
"""Show all figures as SVG/PNG payloads sent to the IPython clients.
Parameters
@@ -24,6 +24,10 @@
If true, a ``plt.close('all')`` call is automatically issued after
sending all the figures. If this is set, the figures will entirely
removed from the internal list of figures.
+ block : Not used.
+ The `block` parameter is a Matplotlib experimental parameter.
+ We accept it in the function signature for compatibility with other
+ backends.
"""
if close is None:
close = InlineBackend.instance().close_figures
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/ipykernel/tests/test_kernelspec.py
new/ipykernel-4.1.0/ipykernel/tests/test_kernelspec.py
--- old/ipykernel-4.0.3/ipykernel/tests/test_kernelspec.py 2015-05-08
22:15:04.000000000 +0200
+++ new/ipykernel-4.1.0/ipykernel/tests/test_kernelspec.py 2015-09-22
09:39:51.000000000 +0200
@@ -7,7 +7,7 @@
import shutil
import sys
import tempfile
-
+
try:
from unittest import mock
except ImportError:
@@ -20,6 +20,7 @@
get_kernel_dict,
write_kernel_spec,
install,
+ InstallIPythonKernelSpecApp,
KERNEL_NAME,
RESOURCES,
)
@@ -75,6 +76,17 @@
shutil.rmtree(path)
+def test_install_kernelspec():
+
+ path = tempfile.mkdtemp()
+ try:
+ test = InstallIPythonKernelSpecApp.launch_instance(argv=['--prefix',
path])
+ assert_is_spec(os.path.join(
+ path, 'share', 'jupyter', 'kernels', KERNEL_NAME))
+ finally:
+ shutil.rmtree(path)
+
+
def test_install_user():
tmp = tempfile.mkdtemp()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/ipykernel/tests/test_message_spec.py
new/ipykernel-4.1.0/ipykernel/tests/test_message_spec.py
--- old/ipykernel-4.0.3/ipykernel/tests/test_message_spec.py 2015-07-20
23:12:56.000000000 +0200
+++ new/ipykernel-4.1.0/ipykernel/tests/test_message_spec.py 2015-09-17
13:36:50.000000000 +0200
@@ -12,6 +12,7 @@
from Queue import Empty # Py 2
import nose.tools as nt
+from nose.plugins.skip import SkipTest
from traitlets import (
HasTraits, TraitError, Bool, Unicode, Dict, Integer, List, Enum,
@@ -163,6 +164,8 @@
Reference.check(self, d)
LanguageInfo().check(d['language_info'])
+class CommInfoReply(Reference):
+ comms = Dict()
class IsCompleteReply(Reference):
status = Enum((u'complete', u'incomplete', u'invalid', u'unknown'),
default_value=u'complete')
@@ -198,6 +201,7 @@
class ExecuteResult(MimeBundle):
execution_count = Integer()
+
class HistoryReply(Reference):
history = List(List())
@@ -208,6 +212,7 @@
'status' : Status(),
'complete_reply' : CompleteReply(),
'kernel_info_reply': KernelInfoReply(),
+ 'comm_info_reply': CommInfoReply(),
'is_complete_reply': IsCompleteReply(),
'execute_input' : ExecuteInput(),
'execute_result' : ExecuteResult(),
@@ -419,6 +424,15 @@
validate_message(reply, 'kernel_info_reply', msg_id)
+def test_comm_info_request():
+ flush_channels()
+ if not hasattr(KC, 'comm_info'):
+ raise SkipTest()
+ msg_id = KC.comm_info()
+ reply = KC.get_shell_msg(timeout=TIMEOUT)
+ validate_message(reply, 'comm_info_reply', msg_id)
+
+
def test_single_payload():
flush_channels()
msg_id, reply = execute(code="for i in range(3):\n"+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/ipykernel/tests/test_pickleutil.py
new/ipykernel-4.1.0/ipykernel/tests/test_pickleutil.py
--- old/ipykernel-4.0.3/ipykernel/tests/test_pickleutil.py 2015-05-08
22:15:04.000000000 +0200
+++ new/ipykernel-4.1.0/ipykernel/tests/test_pickleutil.py 2015-08-28
17:00:35.000000000 +0200
@@ -1,4 +1,5 @@
+import os
import pickle
import nose.tools as nt
@@ -59,4 +60,9 @@
bar = loads(pfoo)
nt.assert_equal(foo(), bar())
-
\ No newline at end of file
+def test_uncan_bytes_buffer():
+ data = b'data'
+ canned = can(data)
+ canned.buffers = [memoryview(buf) for buf in canned.buffers]
+ out = uncan(canned)
+ nt.assert_equal(out, data)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-4.0.3/ipykernel/zmqshell.py
new/ipykernel-4.1.0/ipykernel/zmqshell.py
--- old/ipykernel-4.0.3/ipykernel/zmqshell.py 2015-05-08 22:15:04.000000000
+0200
+++ new/ipykernel-4.1.0/ipykernel/zmqshell.py 2015-10-05 11:27:35.000000000
+0200
@@ -34,7 +34,6 @@
from IPython.core import payloadpage
from IPython.core.usage import default_gui_banner
from IPython.display import display, Javascript
-from ipykernel.inprocess.socket import SocketABC
from ipykernel import (
get_connection_file, get_connection_info, connect_qtconsole
)
@@ -58,7 +57,7 @@
"""A display publisher that publishes data using a ZeroMQ PUB socket."""
session = Instance(Session, allow_none=True)
- pub_socket = Instance(SocketABC, allow_none=True)
+ pub_socket = Any(allow_none=True)
parent_header = Dict({})
topic = CBytes(b'display_data')
