[Python-modules-commits] [nbconvert] 05/06: merge patched into master
Gordon Ball
chronitis-guest at moszumanska.debian.org
Sat Jun 24 09:10:52 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 7fbabf0d81e4ce12f07d66f201a35befd7509e35
Merge: 42ed331 fbb9102
Author: Gordon Ball <gordon at chronitis.net>
Date: Sat Jun 24 10:52:57 2017 +0200
merge patched into master
.gitignore | 4 +
.travis.yml | 2 +
CONTRIBUTING.md | 15 +
debian/.git-dpm | 6 +-
debian/patches/0001-Require-ipython-5.patch | 6 +-
...nloading-CSS-from-the-web-since-we-can-co.patch | 4 +-
docs/source/api/preprocessors.rst | 2 +
docs/source/changelog.rst | 34 +
docs/source/customizing.ipynb | 24622 ++++++++++++++++++-
docs/source/development_release.rst | 81 +
docs/source/example.ipynb | 65 +-
docs/source/external_exporters.rst | 2 +-
docs/source/index.rst | 1 +
docs/source/nbconvert_library.ipynb | 2 +-
nbconvert/_version.py | 65 +-
nbconvert/exporters/asciidoc.py | 5 +-
nbconvert/exporters/exporter.py | 19 +-
nbconvert/exporters/html.py | 17 +-
nbconvert/exporters/markdown.py | 4 +-
nbconvert/exporters/rst.py | 9 +-
nbconvert/exporters/script.py | 32 +-
nbconvert/exporters/slides.py | 46 +-
nbconvert/exporters/templateexporter.py | 48 +-
nbconvert/exporters/tests/test_rst.py | 9 +
nbconvert/exporters/tests/test_script.py | 18 +-
nbconvert/exporters/tests/test_templateexporter.py | 94 +
nbconvert/filters/markdown_mistune.py | 18 +-
nbconvert/filters/strings.py | 4 +-
nbconvert/filters/tests/test_citation.py | 10 +-
nbconvert/filters/tests/test_markdown.py | 52 +-
nbconvert/nbconvertapp.py | 14 +-
nbconvert/preprocessors/__init__.py | 1 +
nbconvert/preprocessors/clearoutput.py | 9 +
nbconvert/preprocessors/execute.py | 119 +-
nbconvert/preprocessors/regexremove.py | 57 +
.../tests/files/update-display-id.ipynb | 173 +
nbconvert/preprocessors/tests/test_clearoutput.py | 28 +-
nbconvert/preprocessors/tests/test_execute.py | 30 +-
nbconvert/preprocessors/tests/test_regexremove.py | 70 +
nbconvert/preprocessors/tests/test_sanitize.py | 10 +-
nbconvert/templates/asciidoc.tpl | 13 +-
nbconvert/templates/html/basic.tpl | 8 +
nbconvert/templates/html/full.tpl | 6 +
nbconvert/templates/html/mathjax.tpl | 2 +-
nbconvert/templates/html/slides_reveal.tpl | 8 +-
nbconvert/templates/latex/document_contents.tplx | 2 +-
nbconvert/templates/latex/report.tplx | 2 +-
nbconvert/templates/latex/skeleton/null.tplx | 107 +-
nbconvert/templates/latex/style_bw_ipython.tplx | 8 +-
nbconvert/templates/latex/style_bw_python.tplx | 4 +
nbconvert/templates/latex/style_ipython.tplx | 12 +-
nbconvert/templates/latex/style_python.tplx | 6 +-
nbconvert/templates/markdown.tpl | 7 +-
nbconvert/templates/python.tpl | 4 +-
nbconvert/templates/rst.tpl | 22 +-
nbconvert/templates/skeleton/null.tpl | 107 +-
.../eptest-0.1.dist-info/entry_points.txt | 3 +
nbconvert/tests/exporter_entrypoint/eptest.py | 4 +
nbconvert/tests/test_nbconvertapp.py | 30 +
nbconvert/utils/exceptions.py | 3 +-
setup.py | 8 +-
61 files changed, 25901 insertions(+), 272 deletions(-)
diff --cc debian/.git-dpm
index 081e4b6,0000000..24faf18
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
- 7ae61abe37ce6ec940226d2bb53a0c414addbd66
- 7ae61abe37ce6ec940226d2bb53a0c414addbd66
- 77ac5d9046b9e679b3d5107b19d4f2139b6a1262
++fbb91026b114a67b1ffe4d0f8a02bb1be2522f08
++fbb91026b114a67b1ffe4d0f8a02bb1be2522f08
++601dc5986b259c0b8b4d756de31a453213246e52
+601dc5986b259c0b8b4d756de31a453213246e52
+nbconvert_5.2.1.orig.tar.gz
+3137ac4bba7e8417e557351ca1fa6a480be1e808
+482907
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Require-ipython-5.patch
index 4b917e4,0000000..e1aac19
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 6d7635b620deb251c9c9fde14305d4fb81c9ae51 Mon Sep 17 00:00:00 2001
++From 556480c7b5f5dc20b40707a4a758a5338a11ff6a 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 37654fa..6acc808 100644
++index 93f8619..723f87b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -195,6 +195,7 @@ install_requires = setuptools_args['install_requires'] = [
+ 'bleach',
+ 'pandocfilters>=1.4.1',
+ 'testpath',
++ 'ipython>=5',
+ ]
+
- extras_require = setuptools_args['extras_require'] = {
++ extra_requirements = {
diff --cc debian/patches/0002-Disable-downloading-CSS-from-the-web-since-we-can-co.patch
index 47f2e78,0000000..dbf21e0
mode 100644,000000..100644
--- a/debian/patches/0002-Disable-downloading-CSS-from-the-web-since-we-can-co.patch
+++ b/debian/patches/0002-Disable-downloading-CSS-from-the-web-since-we-can-co.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 7ae61abe37ce6ec940226d2bb53a0c414addbd66 Mon Sep 17 00:00:00 2001
++From fbb91026b114a67b1ffe4d0f8a02bb1be2522f08 Mon Sep 17 00:00:00 2001
+From: Gordon Ball <gordon at chronitis.net>
+Date: Thu, 26 Jan 2017 13:47:34 +0100
+Subject: Disable downloading CSS from the web, since we can copy it directly
+ from the notebook package instead
+
+---
+ setup.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
- index 6acc808..58a6d7f 100644
++index 723f87b..481742c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -143,8 +143,6 @@ def css_first(command):
+ return command.run(self)
+ return CSSFirst
+
+-cmdclass['build'] = css_first(build)
+-cmdclass['sdist'] = css_first(sdist)
+ cmdclass['bdist_egg'] = bdist_egg if 'bdist_egg' in sys.argv else bdist_egg_disabled
+
+ for d, _, _ in os.walk(pjoin(pkg_root, 'templates')):
--
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