[Python-modules-commits] [nbconvert] 05/11: merge patched into master
Gordon Ball
chronitis-guest at moszumanska.debian.org
Fri Jan 27 19:25:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
chronitis-guest pushed a commit to branch master
in repository nbconvert.
commit de127f62d3718d3a57d59e743caf1d35ba49d337
Merge: 7bdb3c7 6d7635b
Author: Gordon Ball <gordon at chronitis.net>
Date: Thu Jan 26 13:00:56 2017 +0100
merge patched into master
docs/src/ipykernel/.gitignore => .gitignore | 9 +-
docs/src/ipykernel/.mailmap => .mailmap | 0
.travis.yml | 42 +
CONTRIBUTING.md | 2 +-
docs/src/ipykernel/MANIFEST.in => MANIFEST.in | 0
PKG-INFO | 21 -
README.md | 14 +-
codecov.yml | 10 +
debian/.git-dpm | 6 +-
...python-5.patch => 0001-Require-ipython-5.patch} | 12 +-
...ols-for-all-targets-so-python-Depends-sub.patch | 24 -
debian/patches/series | 3 +-
docs/README.md | 31 +-
docs/autogen_config.py | 2 +-
docs/environment.yml | 13 +-
docs/source/api/exporters.rst | 36 +-
docs/source/api/filters.rst | 4 +-
docs/source/architecture.rst | 65 +-
docs/source/changelog.rst | 48 +
docs/source/conf.py | 6 +-
docs/source/customizing.ipynb | 20 +-
docs/source/execute_api.rst | 4 +-
docs/source/external_exporters.rst | 27 +-
docs/source/install.rst | 49 +-
docs/source/latex_citations.rst | 2 +-
docs/source/nbconvert_library.ipynb | 28 +-
docs/source/template_structure.html | 18 +-
docs/source/usage.rst | 10 +
docs/src/ipykernel/.travis.yml | 17 -
docs/src/ipykernel/CONTRIBUTING.md | 3 -
docs/src/ipykernel/COPYING.md | 59 -
docs/src/ipykernel/README.md | 11 -
docs/src/ipykernel/docs/Makefile | 192 -
docs/src/ipykernel/docs/changelog.rst | 58 -
docs/src/ipykernel/docs/conf.py | 303 -
docs/src/ipykernel/docs/index.rst | 23 -
docs/src/ipykernel/docs/make.bat | 263 -
.../examples/embedding/inprocess_qtconsole.py | 46 -
.../examples/embedding/inprocess_terminal.py | 31 -
.../examples/embedding/internal_ipkernel.py | 55 -
.../ipykernel/examples/embedding/ipkernel_qtapp.py | 75 -
.../ipykernel/examples/embedding/ipkernel_wxapp.py | 119 -
docs/src/ipykernel/ipykernel.egg-info/PKG-INFO | 21 -
docs/src/ipykernel/ipykernel.egg-info/SOURCES.txt | 73 -
.../ipykernel.egg-info/dependency_links.txt | 1 -
docs/src/ipykernel/ipykernel.egg-info/requires.txt | 7 -
.../src/ipykernel/ipykernel.egg-info/top_level.txt | 1 -
docs/src/ipykernel/ipykernel/__init__.py | 2 -
docs/src/ipykernel/ipykernel/__main__.py | 3 -
docs/src/ipykernel/ipykernel/_version.py | 5 -
docs/src/ipykernel/ipykernel/codeutil.py | 35 -
docs/src/ipykernel/ipykernel/comm/__init__.py | 2 -
docs/src/ipykernel/ipykernel/comm/comm.py | 169 -
docs/src/ipykernel/ipykernel/comm/manager.py | 158 -
docs/src/ipykernel/ipykernel/connect.py | 180 -
docs/src/ipykernel/ipykernel/datapub.py | 57 -
docs/src/ipykernel/ipykernel/displayhook.py | 72 -
docs/src/ipykernel/ipykernel/embed.py | 57 -
docs/src/ipykernel/ipykernel/eventloops.py | 273 -
docs/src/ipykernel/ipykernel/gui/__init__.py | 15 -
docs/src/ipykernel/ipykernel/gui/gtk3embed.py | 85 -
docs/src/ipykernel/ipykernel/gui/gtkembed.py | 86 -
docs/src/ipykernel/ipykernel/heartbeat.py | 68 -
docs/src/ipykernel/ipykernel/inprocess/__init__.py | 8 -
docs/src/ipykernel/ipykernel/inprocess/blocking.py | 93 -
docs/src/ipykernel/ipykernel/inprocess/channels.py | 97 -
docs/src/ipykernel/ipykernel/inprocess/client.py | 180 -
docs/src/ipykernel/ipykernel/inprocess/ipkernel.py | 180 -
docs/src/ipykernel/ipykernel/inprocess/manager.py | 75 -
docs/src/ipykernel/ipykernel/inprocess/socket.py | 59 -
.../ipykernel/inprocess/tests/__init__.py | 0
.../ipykernel/inprocess/tests/test_kernel.py | 68 -
.../inprocess/tests/test_kernelmanager.py | 108 -
docs/src/ipykernel/ipykernel/iostream.py | 347 -
docs/src/ipykernel/ipykernel/ipkernel.py | 360 -
docs/src/ipykernel/ipykernel/jsonutil.py | 173 -
docs/src/ipykernel/ipykernel/kernelapp.py | 454 -
docs/src/ipykernel/ipykernel/kernelbase.py | 728 --
docs/src/ipykernel/ipykernel/kernelspec.py | 172 -
docs/src/ipykernel/ipykernel/log.py | 20 -
docs/src/ipykernel/ipykernel/parentpoller.py | 114 -
docs/src/ipykernel/ipykernel/pickleutil.py | 448 -
docs/src/ipykernel/ipykernel/pylab/__init__.py | 0
.../ipykernel/ipykernel/pylab/backend_inline.py | 145 -
docs/src/ipykernel/ipykernel/pylab/config.py | 118 -
.../ipykernel/ipykernel/resources/logo-32x32.png | Bin 1084 -> 0 bytes
.../ipykernel/ipykernel/resources/logo-64x64.png | Bin 2180 -> 0 bytes
docs/src/ipykernel/ipykernel/serialize.py | 183 -
docs/src/ipykernel/ipykernel/tests/__init__.py | 44 -
docs/src/ipykernel/ipykernel/tests/test_connect.py | 63 -
.../ipykernel/ipykernel/tests/test_embed_kernel.py | 163 -
.../src/ipykernel/ipykernel/tests/test_jsonutil.py | 107 -
docs/src/ipykernel/ipykernel/tests/test_kernel.py | 244 -
.../ipykernel/ipykernel/tests/test_kernelspec.py | 109 -
.../ipykernel/ipykernel/tests/test_message_spec.py | 509 -
.../ipykernel/ipykernel/tests/test_pickleutil.py | 68 -
.../ipykernel/ipykernel/tests/test_serialize.py | 217 -
.../ipykernel/ipykernel/tests/test_start_kernel.py | 48 -
docs/src/ipykernel/ipykernel/tests/utils.py | 166 -
docs/src/ipykernel/ipykernel/zmqshell.py | 480 -
docs/src/ipykernel/setup.cfg | 2 -
docs/src/ipykernel/setup.py | 97 -
nbconvert/_version.py | 4 +-
nbconvert/exporters/__init__.py | 5 +-
nbconvert/exporters/asciidoc.py | 47 +
nbconvert/exporters/base.py | 119 +
nbconvert/exporters/export.py | 213 +-
nbconvert/exporters/exporter.py | 30 +-
nbconvert/exporters/exporter_locator.py | 87 +
nbconvert/exporters/html.py | 20 +-
nbconvert/exporters/latex.py | 34 +-
nbconvert/exporters/markdown.py | 39 +-
nbconvert/exporters/notebook.py | 13 +-
nbconvert/exporters/pdf.py | 44 +-
nbconvert/exporters/python.py | 16 +-
nbconvert/exporters/rst.py | 21 +-
nbconvert/exporters/script.py | 14 +-
nbconvert/exporters/slides.py | 15 +-
nbconvert/exporters/templateexporter.py | 148 +-
nbconvert/exporters/tests/files/notebook2.ipynb | 64 +-
nbconvert/exporters/tests/test_asciidoc.py | 41 +
nbconvert/exporters/tests/test_export.py | 6 +-
nbconvert/exporters/tests/test_latex.py | 16 +-
nbconvert/exporters/tests/test_pdf.py | 13 +-
nbconvert/exporters/tests/test_templateexporter.py | 79 +-
nbconvert/filters/__init__.py | 3 +-
nbconvert/filters/datatypefilter.py | 13 +-
nbconvert/filters/filter_links.py | 38 +
nbconvert/filters/highlight.py | 42 +-
nbconvert/filters/latex.py | 3 +-
nbconvert/filters/markdown.py | 48 +-
nbconvert/filters/pandoc.py | 26 +
nbconvert/filters/strings.py | 13 +-
nbconvert/filters/tests/test_datatypefilter.py | 10 +-
nbconvert/filters/tests/test_markdown.py | 28 +-
nbconvert/nbconvertapp.py | 74 +-
nbconvert/postprocessors/serve.py | 29 +-
nbconvert/preprocessors/base.py | 2 +-
nbconvert/preprocessors/convertfigures.py | 18 +-
nbconvert/preprocessors/csshtmlheader.py | 24 +-
nbconvert/preprocessors/execute.py | 130 +-
nbconvert/preprocessors/extractoutput.py | 18 +-
nbconvert/preprocessors/highlightmagics.py | 13 +-
nbconvert/preprocessors/sanitize.py | 138 +
nbconvert/preprocessors/svg2pdf.py | 23 +-
.../preprocessors/tests/fake_kernelmanager.py | 28 +
.../tests/files/Skip Exceptions.ipynb | 9 +-
nbconvert/preprocessors/tests/test_execute.py | 54 +-
nbconvert/preprocessors/tests/test_sanitize.py | 202 +
nbconvert/resources/style.min.css | 11573 -------------------
nbconvert/templates/asciidoc.tpl | 79 +
nbconvert/templates/html/basic.tpl | 76 +-
nbconvert/templates/html/full.tpl | 5 +
nbconvert/templates/html/mathjax.tpl | 6 +-
nbconvert/templates/latex/base.tplx | 78 +-
nbconvert/templates/latex/document_contents.tplx | 72 +
nbconvert/templates/latex/report.tplx | 2 +-
.../templates/latex/skeleton/display_priority.tplx | 6 +
nbconvert/templates/rst.tpl | 13 +-
nbconvert/templates/skeleton/Makefile | 24 +
nbconvert/templates/skeleton/display_priority.tpl | 6 +
nbconvert/tests/README.md | 1 +
nbconvert/tests/base.py | 4 +-
nbconvert/tests/fake_exporters.py | 9 +-
nbconvert/tests/files/Widget_List.ipynb | 4737 ++++++++
.../tests/files/markdown_display_priority.ipynb | 74 +
nbconvert/tests/test_nbconvertapp.py | 90 +-
nbconvert/utils/base.py | 20 +-
nbconvert/utils/lexers.py | 4 +-
nbconvert/writers/base.py | 21 +-
nbconvert/writers/files.py | 27 +-
nbconvert/writers/tests/test_files.py | 24 +-
readthedocs.yml | 5 +
setup.py | 46 +-
174 files changed, 7047 insertions(+), 21607 deletions(-)
diff --cc debian/.git-dpm
index 17afa6d,0000000..6d199ba
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 026366f6c397ea0685ae8a5e2b9cb230d490de95
- 026366f6c397ea0685ae8a5e2b9cb230d490de95
- 885a4bdf677cc6cf760e462ad0602c0f0d64d041
++6d7635b620deb251c9c9fde14305d4fb81c9ae51
++6d7635b620deb251c9c9fde14305d4fb81c9ae51
++77ac5d9046b9e679b3d5107b19d4f2139b6a1262
+77ac5d9046b9e679b3d5107b19d4f2139b6a1262
+nbconvert_5.1.1.orig.tar.gz
+229f1209b2e437ea9d189cc13b496160d43f08bb
+360978
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Require-ipython-5.patch
index c5aa4f5,0000000..4b917e4
mode 100644,000000..100644
--- a/debian/patches/0001-Require-ipython-5.patch
+++ b/debian/patches/0001-Require-ipython-5.patch
@@@ -1,21 -1,0 +1,21 @@@
- From 026366f6c397ea0685ae8a5e2b9cb230d490de95 Mon Sep 17 00:00:00 2001
++From 6d7635b620deb251c9c9fde14305d4fb81c9ae51 Mon Sep 17 00:00:00 2001
+From: Julien Puydt <julien.puydt at laposte.net>
+Date: Wed, 9 Nov 2016 09:28:43 +0100
+Subject: Require ipython >= 5
+
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.py b/setup.py
- index d9e93f8..4ebcd53 100644
++index 37654fa..6acc808 100644
+--- a/setup.py
++++ b/setup.py
- @@ -179,6 +179,7 @@ install_requires = setuptools_args['install_requires'] = [
- 'jupyter_core',
- 'nbformat',
- 'entrypoints',
++@@ -195,6 +195,7 @@ install_requires = setuptools_args['install_requires'] = [
++ 'bleach',
++ 'pandocfilters>=1.4.1',
++ 'testpath',
++ 'ipython>=5',
+ ]
+
+ extras_require = setuptools_args['extras_require'] = {
diff --cc debian/patches/series
index d1c900c,0000000..6762db1
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
- 0001-Use-setuptools-for-all-targets-so-python-Depends-sub.patch
- 0002-Require-ipython-5.patch
++0001-Require-ipython-5.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/nbconvert.git
More information about the Python-modules-commits
mailing list