Hello community, here is the log from the commit of package python-nbsphinx for openSUSE:Factory checked in at 2019-11-29 15:57:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-nbsphinx (Old) and /work/SRC/openSUSE:Factory/.python-nbsphinx.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-nbsphinx" Fri Nov 29 15:57:36 2019 rev:2 rq:748489 version:0.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-nbsphinx/python-nbsphinx.changes 2019-05-22 11:05:40.510580552 +0200 +++ /work/SRC/openSUSE:Factory/.python-nbsphinx.new.26869/python-nbsphinx.changes 2019-11-29 16:01:50.632831837 +0100 @@ -1,0 +2,11 @@ +Wed Nov 13 19:27:48 UTC 2019 - Todd R <toddrme2178@gmail.com> + +- Latest release drops python2 support. + +------------------------------------------------------------------- +Tue Nov 12 16:51:16 UTC 2019 - Todd R <toddrme2178@gmail.com> + +- Update to 0.4.3 + * Add option nbsphinx_requirejs_path (and nbsphinx_requirejs_options) + +------------------------------------------------------------------- Old: ---- nbsphinx-0.4.2.tar.gz New: ---- nbsphinx-0.4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-nbsphinx.spec ++++++ --- /var/tmp/diff_new_pack.87t2BK/_old 2019-11-29 16:01:51.888831322 +0100 +++ /var/tmp/diff_new_pack.87t2BK/_new 2019-11-29 16:01:51.908831314 +0100 @@ -17,8 +17,9 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define skip_python2 1 Name: python-nbsphinx -Version: 0.4.2 +Version: 0.4.3 Release: 0 Summary: Jupyter Notebook Tools for Sphinx License: MIT ++++++ nbsphinx-0.4.2.tar.gz -> nbsphinx-0.4.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/CONTRIBUTING.rst new/nbsphinx-0.4.3/CONTRIBUTING.rst --- old/nbsphinx-0.4.2/CONTRIBUTING.rst 2017-11-28 20:42:46.000000000 +0100 +++ new/nbsphinx-0.4.3/CONTRIBUTING.rst 2019-09-30 15:30:56.000000000 +0200 @@ -11,7 +11,7 @@ git clone https://github.com/spatialaudio/nbsphinx.git cd nbsphinx - python3 setup.py develop --user + python3 -m pip install -e . --user This way, your installation always stays up-to-date, even if you pull new changes from the Github repository. If you have only Python 3 installed, you @@ -43,5 +43,5 @@ The generated files will be available in the directories ``build/sphinx/html/`` and ``build/sphinx/latex/``, respectively. -.. _PyPI: https://pypi.python.org/pypi/nbsphinx/ -.. _Github: http://github.com/spatialaudio/nbsphinx/ +.. _PyPI: https://pypi.org/project/nbsphinx/ +.. _Github: https://github.com/spatialaudio/nbsphinx/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/NEWS.rst new/nbsphinx-0.4.3/NEWS.rst --- old/nbsphinx-0.4.2/NEWS.rst 2019-01-15 10:48:38.000000000 +0100 +++ new/nbsphinx-0.4.3/NEWS.rst 2019-09-30 15:35:55.000000000 +0200 @@ -1,3 +1,6 @@ +Version 0.4.3 (2019-09-30): + * Add option ``nbsphinx_requirejs_path`` (and ``nbsphinx_requirejs_options``) + Version 0.4.2 (2019-01-15): * Re-establish Python 2 compatibility (but the clock is ticking ...) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/PKG-INFO new/nbsphinx-0.4.3/PKG-INFO --- old/nbsphinx-0.4.2/PKG-INFO 2019-01-15 10:51:01.000000000 +0100 +++ new/nbsphinx-0.4.3/PKG-INFO 2019-09-30 15:45:36.000000000 +0200 @@ -1,6 +1,6 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.2 Name: nbsphinx -Version: 0.4.2 +Version: 0.4.3 Summary: Jupyter Notebook Tools for Sphinx Home-page: UNKNOWN Author: Matthias Geier @@ -38,8 +38,8 @@ License: MIT -- see the file ``LICENSE`` for details. - .. _Sphinx: http://sphinx-doc.org/ - .. _Jupyter Notebook: http://jupyter.org/ + .. _Sphinx: https://www.sphinx-doc.org/ + .. _Jupyter Notebook: https://jupyter.org/ Keywords: Sphinx,Jupyter,notebook Platform: any diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/README.rst new/nbsphinx-0.4.3/README.rst --- old/nbsphinx-0.4.2/README.rst 2018-10-01 19:00:08.000000000 +0200 +++ new/nbsphinx-0.4.3/README.rst 2019-09-22 17:10:21.000000000 +0200 @@ -27,5 +27,5 @@ License: MIT -- see the file ``LICENSE`` for details. -.. _Sphinx: http://sphinx-doc.org/ -.. _Jupyter Notebook: http://jupyter.org/ +.. _Sphinx: https://www.sphinx-doc.org/ +.. _Jupyter Notebook: https://jupyter.org/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/doc/a-normal-rst-file.rst new/nbsphinx-0.4.3/doc/a-normal-rst-file.rst --- old/nbsphinx-0.4.2/doc/a-normal-rst-file.rst 2018-12-14 18:15:47.000000000 +0100 +++ new/nbsphinx-0.4.3/doc/a-normal-rst-file.rst 2019-09-22 17:10:21.000000000 +0200 @@ -11,7 +11,7 @@ Links to Sphinx source files can be created like normal `Sphinx hyperlinks`_, just using a relative path to the local file: link_. -.. _Sphinx hyperlinks: http://www.sphinx-doc.org/en/master/usage/ +.. _Sphinx hyperlinks: https://www.sphinx-doc.org/en/master/usage/ restructuredtext/basics.html#external-links .. _link: subdir/a-notebook-in-a-subdir.ipynb @@ -80,7 +80,7 @@ In addition to the way shown above, you can also create links to notebooks (and other Sphinx source files) with -`:ref: <http://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-ref>`_. +`:ref: <https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-ref>`_. This has some disadvantages: * It is arguably a bit more clunky. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/doc/allow-errors-per-cell.ipynb new/nbsphinx-0.4.3/doc/allow-errors-per-cell.ipynb --- old/nbsphinx-0.4.2/doc/allow-errors-per-cell.ipynb 1970-01-01 01:00:00.000000000 +0100 +++ new/nbsphinx-0.4.3/doc/allow-errors-per-cell.ipynb 2019-09-30 15:30:56.000000000 +0200 @@ -0,0 +1,107 @@ +{ + "cells": [ + { + "cell_type": "markdown", + "metadata": { + "nbsphinx": "hidden" + }, + "source": [ + "This notebook is part of the `nbsphinx` documentation: http://nbsphinx.readthedocs.io/." + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Ignoring Errors on a Per-Cell Basis\n", + "\n", + "Instead of ignoring errors for all notebooks or for some selected notebooks (see [the previous notebook](allow-errors.ipynb)), you can be more fine-grained and just allow errors on certain code cells by tagging them with the `raises-exception` tag." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "'no problem'" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "The following code cell has the `raises-exception` tag." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "tags": [ + "raises-exception" + ] + }, + "outputs": [], + "source": [ + "problem" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "The following code cell is executed even though the previous cell raised an exception." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "'no problem'" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "<div class=\"alert alert-info\">\n", + "\n", + "**Note:**\n", + "\n", + "The behavior of the `raises-exception` tag doesn't match its name.\n", + "While it does *allow* exceptions,\n", + "it does not check if an exception is actually raised!\n", + "\n", + "This will hopefully be fixed at some point,\n", + "see https://github.com/jupyter/nbconvert/issues/730.\n", + "\n", + "</div>" + ] + } + ], + "metadata": { + "celltoolbar": "Tags", + "kernelspec": { + "display_name": "Python 3", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.7.4+" + } + }, + "nbformat": 4, + "nbformat_minor": 4 +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/doc/allow-errors.ipynb new/nbsphinx-0.4.3/doc/allow-errors.ipynb --- old/nbsphinx-0.4.2/doc/allow-errors.ipynb 2018-12-14 18:15:47.000000000 +0100 +++ new/nbsphinx-0.4.3/doc/allow-errors.ipynb 2019-09-30 15:30:56.000000000 +0200 @@ -17,7 +17,7 @@ "\n", "Normally, if an exception is raised while executing a notebook, the Sphinx build process is stopped immediately.\n", "\n", - "If a notebook contains errors on purpose (or if you are too lazy to fix them right now), you have three options:\n", + "If a notebook contains errors on purpose (or if you are too lazy to fix them right now), you have four options:\n", "\n", "1. Manually execute the notebook in question and save the results, see [the pre-executed example notebook](pre-executed.ipynb).\n", "\n", @@ -33,7 +33,9 @@ " },\n", " ```\n", "\n", - "This very notebook is an example for the last option.\n", + "4. Allow errors on a per-cell basis using the `raises-exception` tag, see [Ignoring Errors on a Cell-by-Cell Basis](allow-errors-per-cell.ipynb).\n", + "\n", + "This very notebook is an example for the third option.\n", "The results of the following code cells are not stored within the notebook, therefore it is executed during the Sphinx build process.\n", "Since the above-mentioned `allow_errors` flag is set in this notebook's metadata, all cells are executed although most of them cause an exception." ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/doc/code-cells.ipynb new/nbsphinx-0.4.3/doc/code-cells.ipynb --- old/nbsphinx-0.4.2/doc/code-cells.ipynb 2019-01-15 10:46:01.000000000 +0100 +++ new/nbsphinx-0.4.3/doc/code-cells.ipynb 2019-09-30 15:30:56.000000000 +0200 @@ -181,9 +181,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "### Local Image Files\n", - "\n", - "See also [SVG support for LaTeX](markdown-cells.ipynb#SVG-support-for-LaTeX)." + "### Local Image Files" ] }, { @@ -210,6 +208,23 @@ "cell_type": "markdown", "metadata": {}, "source": [ + "See also [SVG support for LaTeX](markdown-cells.ipynb#SVG-support-for-LaTeX)." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "from IPython.display import SVG\n", + "SVG(filename='images/python_logo.svg')" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ "### Image URLs" ] }, @@ -237,7 +252,7 @@ "metadata": {}, "outputs": [], "source": [ - "Image(url='http://jupyter.org/assets/nav_logo.svg')" + "Image(url='https://jupyter.org/assets/nav_logo.svg')" ] }, { @@ -325,7 +340,7 @@ "you should also have a look at the `'svg.hashsalt'` setting.\n", "\n", "For more details on these and other settings, have a look at\n", - "[Default Values for Matplotlib's \"inline\" Backend](http://nbviewer.jupyter.org/github/mgeier/python-audio/blob/master/plotting/matplotlib-inline-defaults.ipynb).\n", + "[Default Values for Matplotlib's \"inline\" Backend](https://nbviewer.jupyter.org/github/mgeier/python-audio/blob/master/plotting/matplotlib-inline-defaults.ipynb).\n", "\n", "The configuration file `ipython_kernel_config.py` can be either\n", "in the directory where your notebook is located\n", @@ -435,7 +450,7 @@ "source": [ "### Pandas Dataframes\n", "\n", - "[Pandas dataframes](http://pandas.pydata.org/pandas-docs/stable/dsintro.html#dataframe)\n", + "[Pandas dataframes](https://pandas.pydata.org/pandas-docs/stable/getting_started/dsintro.html#dataframe)\n", "should be displayed as nicely formatted HTML tables (if you are using HTML output)." ] }, @@ -485,7 +500,7 @@ "This is not enabled by default because of\n", "[Pandas issue #12182](https://github.com/pandas-dev/pandas/issues/12182).\n", "\n", - "The generated LaTeX tables utilize the `booktabs` package, so you have to make sure that package is [loaded in the preamble](http://www.sphinx-doc.org/en/master/latex.html) with:\n", + "The generated LaTeX tables utilize the `booktabs` package, so you have to make sure that package is [loaded in the preamble](https://www.sphinx-doc.org/en/master/latex.html) with:\n", "\n", " \\usepackage{booktabs}\n", "\n", @@ -579,20 +594,6 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "<div class=\"alert alert-info\">\n", - "\n", - "**Note:**\n", - "\n", - "jQuery should be available, but using the readthedocs.org default theme, it's not. See [the issue on Github](https://github.com/rtfd/sphinx_rtd_theme/issues/328).\n", - "Other Sphinx themes are not affected by this.\n", - "\n", - "</div>" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ "### Unsupported Output Types\n", "\n", "If a code cell produces data with an unsupported MIME type, the Jupyter Notebook doesn't generate any output.\n", @@ -665,7 +666,7 @@ "metadata": {}, "source": [ "ANSI also supports a set of 256 indexed colors.\n", - "The following code showing all of them is based on http://bitmote.com/index.php?post/2012/11/19/Using-ANSI-Color-Codes-to-Color...." + "The following code showing all of them is based on [http://bitmote.com/index.php?post/2012/11/19/Using-ANSI-Color-Codes-to-Colorize-Your-Bash-Prompt-on-Linux](https://web.archive.org/web/20190109005413/http://bitmote.com/index.php?post/2012/11/19/Using-ANSI-Color-Codes-to-Colorize-Your-Bash-Prompt-on-Linux)." ] }, { @@ -727,7 +728,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.7.1" + "version": "3.7.2rc1" } }, "nbformat": 4, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/doc/conf.py new/nbsphinx-0.4.3/doc/conf.py --- old/nbsphinx-0.4.2/doc/conf.py 2019-01-15 10:50:15.000000000 +0100 +++ new/nbsphinx-0.4.3/doc/conf.py 2019-09-30 15:30:56.000000000 +0200 @@ -7,8 +7,9 @@ # Select nbsphinx and, if needed, other Sphinx extensions: extensions = [ 'nbsphinx', - 'sphinx.ext.mathjax', - 'sphinxcontrib.bibtex', + 'sphinx.ext.mathjax', # for math equation + 'sphinxcontrib.bibtex', # for bibliographic references + 'sphinxcontrib.rsvgconverter', # for SVG->PDF conversion in LaTeX output ] # Exclude build directory and Jupyter backup files: @@ -52,7 +53,7 @@ # This is processed by Jinja2 and inserted before each notebook nbsphinx_prolog = r""" -{% set docname = env.doc2path(env.docname, base='doc') %} +{% set docname = 'doc/' + env.doc2path(env.docname, base=None) %} .. only:: html @@ -77,11 +78,12 @@ # This is processed by Jinja2 and inserted after each notebook nbsphinx_epilog = r""" +{% set docname = 'doc/' + env.doc2path(env.docname, base=None) %} .. raw:: latex \nbsphinxstopnotebook{\scriptsize\noindent\strut \textcolor{gray}{\dotfill\ \sphinxcode{\sphinxupquote{\strut - {{ env.doc2path(env.docname, base='doc') | escape_latex }}}} ends here.}} + {{ docname | escape_latex }}}} ends here.}} """ # Input prompt for code cells. "%s" is replaced by the execution count. @@ -96,6 +98,12 @@ # '.Rmd': lambda s: jupytext.reads(s, '.Rmd'), #} +# Link or path to require.js, set to empty string to disable +#nbsphinx_requirejs_path = '' + +# Options for loading require.js +#nbsphinx_requirejs_options = {'async': 'async'} + mathjax_config = { 'TeX': {'equationNumbers': {'autoNumber': 'AMS', 'useLabelIds': True}}, } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/doc/executing-notebooks.ipynb new/nbsphinx-0.4.3/doc/executing-notebooks.ipynb --- old/nbsphinx-0.4.2/doc/executing-notebooks.ipynb 2018-12-14 18:15:47.000000000 +0100 +++ new/nbsphinx-0.4.3/doc/executing-notebooks.ipynb 2019-09-30 15:30:56.000000000 +0200 @@ -30,6 +30,7 @@ "* [Pre-Executing Notebooks](pre-executed.ipynb)\n", "* [Explicitly Dis-/Enabling Notebook Execution](never-execute.ipynb)\n", "* [Ignoring Errors](allow-errors.ipynb)\n", + "* [Ignoring Errors on a Per-Cell Basis](allow-errors-per-cell.ipynb)\n", "* [Cell Execution Timeout](timeout.ipynb)" ] } @@ -50,9 +51,9 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.5.1+" + "version": "3.7.4+" } }, "nbformat": 4, - "nbformat_minor": 1 + "nbformat_minor": 4 } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/doc/images/python_logo.svg new/nbsphinx-0.4.3/doc/images/python_logo.svg --- old/nbsphinx-0.4.2/doc/images/python_logo.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/nbsphinx-0.4.3/doc/images/python_logo.svg 2019-09-30 15:30:56.000000000 +0200 @@ -0,0 +1,269 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.0" + width="388.84pt" + height="115.02pt" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.43" + sodipodi:docname="logo-python-generic.svg" + sodipodi:docbase="/home/sdeibel"> + <metadata + id="metadata2193"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + inkscape:window-height="543" + inkscape:window-width="791" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + inkscape:zoom="1.4340089" + inkscape:cx="243.02499" + inkscape:cy="71.887497" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:current-layer="svg2" /> + <defs + id="defs4"> + <linearGradient + id="linearGradient2795"> + <stop + style="stop-color:#b8b8b8;stop-opacity:0.49803922" + offset="0" + id="stop2797" /> + <stop + style="stop-color:#7f7f7f;stop-opacity:0" + offset="1" + id="stop2799" /> + </linearGradient> + <linearGradient + id="linearGradient2787"> + <stop + style="stop-color:#7f7f7f;stop-opacity:0.5" + offset="0" + id="stop2789" /> + <stop + style="stop-color:#7f7f7f;stop-opacity:0" + offset="1" + id="stop2791" /> + </linearGradient> + <linearGradient + id="linearGradient3676"> + <stop + style="stop-color:#b2b2b2;stop-opacity:0.5" + offset="0" + id="stop3678" /> + <stop + style="stop-color:#b3b3b3;stop-opacity:0" + offset="1" + id="stop3680" /> + </linearGradient> + <linearGradient + id="linearGradient3236"> + <stop + style="stop-color:#f4f4f4;stop-opacity:1" + offset="0" + id="stop3244" /> + <stop + style="stop-color:#ffffff;stop-opacity:1" + offset="1" + id="stop3240" /> + </linearGradient> + <linearGradient + id="linearGradient4671"> + <stop + style="stop-color:#ffd43b;stop-opacity:1" + offset="0" + id="stop4673" /> + <stop + style="stop-color:#ffe873;stop-opacity:1" + offset="1" + id="stop4675" /> + </linearGradient> + <linearGradient + id="linearGradient4689"> + <stop + style="stop-color:#5a9fd4;stop-opacity:1" + offset="0" + id="stop4691" /> + <stop + style="stop-color:#306998;stop-opacity:1" + offset="1" + id="stop4693" /> + </linearGradient> + <linearGradient + x1="224.23996" + y1="144.75717" + x2="-65.308502" + y2="144.75717" + id="linearGradient2987" + xlink:href="#linearGradient4671" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(100.2702,99.61116)" /> + <linearGradient + x1="172.94208" + y1="77.475983" + x2="26.670298" + y2="76.313133" + id="linearGradient2990" + xlink:href="#linearGradient4689" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(100.2702,99.61116)" /> + <linearGradient + x1="172.94208" + y1="77.475983" + x2="26.670298" + y2="76.313133" + id="linearGradient2587" + xlink:href="#linearGradient4689" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(100.2702,99.61116)" /> + <linearGradient + x1="224.23996" + y1="144.75717" + x2="-65.308502" + y2="144.75717" + id="linearGradient2589" + xlink:href="#linearGradient4671" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(100.2702,99.61116)" /> + <linearGradient + x1="172.94208" + y1="77.475983" + x2="26.670298" + y2="76.313133" + id="linearGradient2248" + xlink:href="#linearGradient4689" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(100.2702,99.61116)" /> + <linearGradient + x1="224.23996" + y1="144.75717" + x2="-65.308502" + y2="144.75717" + id="linearGradient2250" + xlink:href="#linearGradient4671" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(100.2702,99.61116)" /> + <linearGradient + x1="224.23996" + y1="144.75717" + x2="-65.308502" + y2="144.75717" + id="linearGradient2255" + xlink:href="#linearGradient4671" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.562541,0,0,0.567972,-11.5974,-7.60954)" /> + <linearGradient + x1="172.94208" + y1="76.176224" + x2="26.670298" + y2="76.313133" + id="linearGradient2258" + xlink:href="#linearGradient4689" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.562541,0,0,0.567972,-11.5974,-7.60954)" /> + <radialGradient + cx="61.518883" + cy="132.28575" + r="29.036913" + fx="61.518883" + fy="132.28575" + id="radialGradient2801" + xlink:href="#linearGradient2795" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.177966,0,108.7434)" /> + <linearGradient + x1="150.96111" + y1="192.35176" + x2="112.03144" + y2="137.27299" + id="linearGradient1475" + xlink:href="#linearGradient4671" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.562541,0,0,0.567972,-9.399749,-5.305317)" /> + <linearGradient + x1="26.648937" + y1="20.603781" + x2="135.66525" + y2="114.39767" + id="linearGradient1478" + xlink:href="#linearGradient4689" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.562541,0,0,0.567972,-9.399749,-5.305317)" /> + <radialGradient + cx="61.518883" + cy="132.28575" + r="29.036913" + fx="61.518883" + fy="132.28575" + id="radialGradient1480" + xlink:href="#linearGradient2795" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.382716e-8,-0.296405,1.43676,4.683673e-7,-128.544,150.5202)" /> + </defs> + <g + id="g2303"> + <path + id="path46" + style="fill:#646464;fill-opacity:1" + d="M 184.61344,61.929363 C 184.61344,47.367213 180.46118,39.891193 172.15666,39.481813 C 168.85239,39.325863 165.62611,39.852203 162.48754,41.070593 C 159.98254,41.967323 158.2963,42.854313 157.40931,43.751043 L 157.40931,78.509163 C 162.72147,81.842673 167.43907,83.392453 171.55234,83.148783 C 180.25649,82.573703 184.61344,75.507063 184.61344,61.929363 z M 194.85763,62.533683 C 194.85763,69.931723 193.12265,76.072393 189.63319,80.955683 C 185.7441,86.482283 180.35396,89.328433 173.46277,89.484393 C 168.26757,89.650093 162.91642,88.022323 157.40931,84.610843 L 157.40931,116.20116 L 148.50047,113.02361 L 148.50047,42.903043 C 149.96253,41.109583 151.84372,39.569543 154.12454,38.263433 C 159.42696,35.173603 165.86978,33.584823 173.45302,33.506853 L 173.57973,33.633563 C 180.50991,33.545833 185.85132,36.391993 189.60395,42.162263 C 193.10315,47.454933 194.85763,54.238913 194.85763,62.533683 z " /> + <path + id="path48" + style="fill:#646464;fill-opacity:1" + d="M 249.30487,83.265743 C 249.30487,93.188283 248.31067,100.05998 246.32227,103.88084 C 244.32411,107.7017 240.52275,110.75254 234.90842,113.02361 C 230.35653,114.81707 225.43425,115.79178 220.15133,115.95748 L 218.67952,110.34316 C 224.05016,109.61213 227.83204,108.88109 230.02513,108.15006 C 234.34309,106.688 237.30621,104.44617 238.93397,101.44406 C 240.24008,98.997543 240.88339,94.328693 240.88339,87.418003 L 240.88339,85.098203 C 234.79146,87.866373 228.40711,89.240713 221.73036,89.240713 C 217.34417,89.240713 213.47457,87.866373 210.14107,85.098203 C 206.39818,82.086343 204.52674,78.265483 204.52674,73.635623 L 204.52674,36.557693 L 213.43558,33.506853 L 213.43558,70.828453 C 213.43558,74.815013 214.7222,77.885353 217.29543,80.039463 C 219.86866,82.193563 223.20217,83.226753 227.2862,83.148783 C 231.37023,83.061053 235.74667,81.482023 240.39603,78.392203 L 240.39603,34.851953 L 249.30487,34.851953 L 249.30487,83.265743 z " /> + <path + id="path50" + style="fill:#646464;fill-opacity:1" + d="M 284.08249,88.997033 C 283.02006,89.084753 282.04535,89.123743 281.14862,89.123743 C 276.10937,89.123743 272.18129,87.924853 269.37413,85.517323 C 266.57671,83.109793 265.17314,79.786033 265.17314,75.546053 L 265.17314,40.456523 L 259.07146,40.456523 L 259.07146,34.851953 L 265.17314,34.851953 L 265.17314,19.968143 L 274.07223,16.800333 L 274.07223,34.851953 L 284.08249,34.851953 L 284.08249,40.456523 L 274.07223,40.456523 L 274.07223,75.302373 C 274.07223,78.645623 274.96896,81.014163 276.76243,82.398253 C 278.30247,83.538663 280.74899,84.191723 284.08249,84.357423 L 284.08249,88.997033 z " /> + <path + id="path52" + style="fill:#646464;fill-opacity:1" + d="M 338.02288,88.266003 L 329.11404,88.266003 L 329.11404,53.878273 C 329.11404,50.379063 328.29528,47.367213 326.66753,44.852463 C 324.78634,42.006313 322.17411,40.583233 318.82112,40.583233 C 314.73708,40.583233 309.6296,42.737343 303.4987,47.045563 L 303.4987,88.266003 L 294.58985,88.266003 L 294.58985,6.0687929 L 303.4987,3.2616329 L 303.4987,40.700203 C 309.191,36.557693 315.40963,34.481563 322.16436,34.481563 C 326.88196,34.481563 330.70282,36.070333 333.62694,39.238143 C 336.56082,42.405943 338.02288,46.353513 338.02288,51.071103 L 338.02288,88.266003 L 338.02288,88.266003 z " /> + <path + id="path54" + style="fill:#646464;fill-opacity:1" + d="M 385.37424,60.525783 C 385.37424,54.930953 384.31182,50.310833 382.19669,46.655673 C 379.68195,42.201253 375.77337,39.852203 370.49044,39.608523 C 360.72386,40.173863 355.85032,47.172273 355.85032,60.584263 C 355.85032,66.734683 356.86401,71.871393 358.91089,75.994413 C 361.52312,81.248093 365.44145,83.840823 370.66589,83.753103 C 380.47146,83.675123 385.37424,75.935933 385.37424,60.525783 z M 395.13109,60.584263 C 395.13109,68.547643 393.09395,75.175663 389.02941,80.468333 C 384.5555,86.394563 378.37584,89.367423 370.49044,89.367423 C 362.67328,89.367423 356.58135,86.394563 352.18541,80.468333 C 348.19885,75.175663 346.21044,68.547643 346.21044,60.584263 C 346.21044,53.098503 348.36455,46.801883 352.67276,41.674913 C 357.22466,36.236033 363.20937,33.506853 370.6074,33.506853 C 378.00545,33.506853 384.02914,36.236033 388.66877,41.674913 C 392.97697,46.801883 395.13109,53.098503 395.13109,60.584263 z " /> + <path + id="path56" + style="fill:#646464;fill-opacity:1" + d="M 446.20583,88.266003 L 437.29699,88.266003 L 437.29699,51.928853 C 437.29699,47.942293 436.0981,44.832973 433.70032,42.591133 C 431.30253,40.359053 428.10549,39.277123 424.11893,39.364853 C 419.8887,39.442833 415.86314,40.826913 412.04229,43.507363 L 412.04229,88.266003 L 403.13345,88.266003 L 403.13345,42.405943 C 408.26042,38.672813 412.97801,36.236033 417.28621,35.095623 C 421.35076,34.033193 424.93769,33.506853 428.02752,33.506853 C 430.14264,33.506853 432.13104,33.711543 434.00248,34.120913 C 437.50169,34.929923 440.34783,36.430973 442.54093,38.633823 C 444.98744,41.070593 446.20583,43.994723 446.20583,47.415943 L 446.20583,88.266003 z " /> + <path + id="path1948" + style="fill:url(#linearGradient1478);fill-opacity:1" + d="M 60.510156,6.3979729 C 55.926503,6.4192712 51.549217,6.8101906 47.697656,7.4917229 C 36.35144,9.4962267 34.291407,13.691825 34.291406,21.429223 L 34.291406,31.647973 L 61.103906,31.647973 L 61.103906,35.054223 L 34.291406,35.054223 L 24.228906,35.054223 C 16.436447,35.054223 9.6131468,39.73794 7.4789058,48.647973 C 5.0170858,58.860939 4.9078907,65.233996 7.4789058,75.897973 C 9.3848341,83.835825 13.936449,89.491721 21.728906,89.491723 L 30.947656,89.491723 L 30.947656,77.241723 C 30.947656,68.391821 38.6048,60.585475 47.697656,60.585473 L 74.478906,60.585473 C 81.933857,60.585473 87.885159,54.447309 87.885156,46.960473 L 87.885156,21.429223 C 87.885156,14.162884 81.755176,8.7044455 74.478906,7.4917229 C 69.872919,6.7249976 65.093809,6.3766746 60.510156,6.3979729 z M 46.010156,14.616723 C 48.779703,14.616723 51.041406,16.915369 51.041406,19.741723 C 51.041404,22.558059 48.779703,24.835473 46.010156,24.835473 C 43.23068,24.835472 40.978906,22.558058 40.978906,19.741723 C 40.978905,16.91537 43.23068,14.616723 46.010156,14.616723 z " /> + <path + id="path1950" + style="fill:url(#linearGradient1475);fill-opacity:1" + d="M 91.228906,35.054223 L 91.228906,46.960473 C 91.228906,56.191228 83.403011,63.960472 74.478906,63.960473 L 47.697656,63.960473 C 40.361823,63.960473 34.291407,70.238956 34.291406,77.585473 L 34.291406,103.11672 C 34.291406,110.38306 40.609994,114.65704 47.697656,116.74172 C 56.184987,119.23733 64.323893,119.68835 74.478906,116.74172 C 81.229061,114.78733 87.885159,110.85411 87.885156,103.11672 L 87.885156,92.897973 L 61.103906,92.897973 L 61.103906,89.491723 L 87.885156,89.491723 L 101.29141,89.491723 C 109.08387,89.491723 111.98766,84.056315 114.69765,75.897973 C 117.49698,67.499087 117.37787,59.422197 114.69765,48.647973 C 112.77187,40.890532 109.09378,35.054223 101.29141,35.054223 L 91.228906,35.054223 z M 76.166406,99.710473 C 78.945884,99.710476 81.197656,101.98789 81.197656,104.80422 C 81.197654,107.63057 78.945881,109.92922 76.166406,109.92922 C 73.396856,109.92922 71.135156,107.63057 71.135156,104.80422 C 71.135158,101.98789 73.396853,99.710473 76.166406,99.710473 z " /> + <path + id="text3004" + style="font-size:15.16445827px;font-style:normal;font-weight:normal;line-height:125%;fill:#646464;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + d="M 463.5544,26.909383 L 465.11635,26.909383 L 465.11635,17.113143 L 468.81648,17.113143 L 468.81648,15.945483 L 459.85427,15.945483 L 459.85427,17.113143 L 463.5544,17.113143 L 463.5544,26.909383 M 470.20142,26.909383 L 471.53589,26.909383 L 471.53589,17.962353 L 474.4323,26.908259 L 475.91799,26.908259 L 478.93615,17.992683 L 478.93615,26.909383 L 480.39194,26.909383 L 480.39194,15.945483 L 478.46605,15.945483 L 475.16774,25.33834 L 472.35477,15.945483 L 470.20142,15.945483 L 470.20142,26.909383" /> + <path + id="path1894" + style="opacity:0.44382019;fill:url(#radialGradient1480);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0.73406,0,0,0.809524,16.24958,27.00935)" + d="M 110.46717 132.28575 A 48.948284 8.6066771 0 1 1 12.570599,132.28575 A 48.948284 8.6066771 0 1 1 110.46717 132.28575 z" /> + </g> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/doc/installation.ipynb new/nbsphinx-0.4.3/doc/installation.ipynb --- old/nbsphinx-0.4.2/doc/installation.ipynb 2018-12-14 18:15:47.000000000 +0100 +++ new/nbsphinx-0.4.3/doc/installation.ipynb 2019-09-30 15:30:56.000000000 +0200 @@ -23,15 +23,15 @@ "\n", "[](https://anaconda.org/conda-forge/nbsphinx)\n", "\n", - "If you are using the `conda` package manager (e.g. with [Anaconda](https://www.anaconda.com/download/) for Linux/macOS/Windows), you can install `nbsphinx` from the [conda-forge](https://conda-forge.org/) channel:\n", + "If you are using the `conda` package manager (e.g. with [Anaconda](https://www.anaconda.com/distribution/) for Linux/macOS/Windows), you can install `nbsphinx` from the [conda-forge](https://conda-forge.org/) channel:\n", "\n", " conda install -c conda-forge nbsphinx\n", "\n", "If you are using Linux, there are packages available for many distributions.\n", "\n", - "[](https://repology.org/metapackage/python:nbsphinx/versions)\n", + "[](https://repology.org/project/python:nbsphinx/versions)\n", "\n", - "[](https://pypi.org/project/nbsphinx)\n", + "[](https://pypi.org/project/nbsphinx)\n", "\n", "On any platform, you can also install `nbsphinx` with `pip`, Python's own package manager:\n", "\n", @@ -62,11 +62,11 @@ "\n", "Of course you'll need Python, because both Sphinx and `nbsphinx` are implemented in Python.\n", "There are many ways to get Python.\n", - "If you don't know which one is best for you, you can try [Anaconda](https://www.anaconda.com/download/).\n", + "If you don't know which one is best for you, you can try [Anaconda](https://www.anaconda.com/distribution/).\n", "\n", "### Sphinx\n", "\n", - "You'll need [Sphinx](http://www.sphinx-doc.org/) as well, because `nbsphinx` is just a Sphinx extension and doesn't do anything on its own.\n", + "You'll need [Sphinx](https://www.sphinx-doc.org/) as well, because `nbsphinx` is just a Sphinx extension and doesn't do anything on its own.\n", "\n", "If you use `conda`, you can get [Sphinx from the conda-forge channel](https://anaconda.org/conda-forge/sphinx):\n", "\n", @@ -83,11 +83,11 @@ "\n", "### pandoc\n", "\n", - "The stand-alone program [pandoc](http://pandoc.org/) is used to convert Markdown content to something Sphinx can understand. You have to install this program separately, ideally with your package manager. If you are using `conda`, you can install [pandoc from the conda-forge channel](https://anaconda.org/conda-forge/pandoc):\n", + "The stand-alone program [pandoc](https://pandoc.org/) is used to convert Markdown content to something Sphinx can understand. You have to install this program separately, ideally with your package manager. If you are using `conda`, you can install [pandoc from the conda-forge channel](https://anaconda.org/conda-forge/pandoc):\n", "\n", " conda install -c conda-forge pandoc\n", "\n", - "If that doesn't work out for you, have a look at `pandoc`'s [installation instructions](http://pandoc.org/installing.html).\n", + "If that doesn't work out for you, have a look at `pandoc`'s [installation instructions](https://pandoc.org/installing.html).\n", "\n", "<div class=\"alert alert-info\">\n", "\n", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/doc/links.ipynb new/nbsphinx-0.4.3/doc/links.ipynb --- old/nbsphinx-0.4.2/doc/links.ipynb 2018-12-14 18:15:47.000000000 +0100 +++ new/nbsphinx-0.4.3/doc/links.ipynb 2019-09-30 15:30:56.000000000 +0200 @@ -67,6 +67,32 @@ "cell_type": "markdown", "metadata": {}, "source": [ + "**jupyter-book**\n", + "\n", + "Create an online book with Jupyter Notebooks and Jekyll\n", + "\n", + "https://jupyter.org/jupyter-book\n", + "\n", + "https://github.com/jupyter/jupyter-book" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "**nbinteract**\n", + "\n", + "Create interactive webpages from Jupyter Notebooks\n", + "\n", + "https://www.nbinteract.com/\n", + "\n", + "https://github.com/SamLau95/nbinteract" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ "**nb_pdf_template**\n", "\n", "An extended `nbconvert` template for LaTeX output.\n", @@ -145,6 +171,19 @@ "cell_type": "markdown", "metadata": {}, "source": [ + "**jupyter-sphinx**\n", + "\n", + "Jupyter Sphinx is a Sphinx extension that executes embedded code in a Jupyter kernel, and embeds outputs of that code in the output document. It has support for rich output such as images, Latex math and even javascript widgets.\n", + "\n", + "https://jupyter-sphinx.readthedocs.io/\n", + "\n", + "https://github.com/jupyter/jupyter-sphinx" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ "**DocOnce**\n", "\n", "http://hplgit.github.io/doconce/doc/web/index.html" @@ -158,7 +197,7 @@ "\n", "https://github.com/perrette/dimarray/blob/master/docs/scripts/nbconvert_to_rst.py\n", "\n", - "https://gist.github.com/hadim/16e29b5848672e2e497c\n", + "`https://gist.github.com/hadim/16e29b5848672e2e497c` (not available anymore)\n", "\n", "https://sphinx-ipynb.readthedocs.io/" ] @@ -213,9 +252,9 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.7.1" + "version": "3.7.3" } }, "nbformat": 4, - "nbformat_minor": 2 + "nbformat_minor": 4 } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/doc/markdown-cells.ipynb new/nbsphinx-0.4.3/doc/markdown-cells.ipynb --- old/nbsphinx-0.4.2/doc/markdown-cells.ipynb 2019-01-15 10:46:01.000000000 +0100 +++ new/nbsphinx-0.4.3/doc/markdown-cells.ipynb 2019-09-30 15:30:56.000000000 +0200 @@ -56,7 +56,7 @@ "\n", " ERROR: Unknown interpreted text role \"raw-latex\".\n", "\n", - "See also the [pandoc docs](http://pandoc.org/MANUAL.html#math):\n", + "See also the [pandoc docs](https://pandoc.org/MANUAL.html#math):\n", "\n", "> Anything between two `$` characters will be treated as TeX math. The opening `$` must have a non-space character immediately to its right, while the closing `$` must have a non-space character immediately to its left, and must not be followed immediately by a digit.\n", "\n", @@ -91,8 +91,8 @@ "but you can install a notebook extension in order to enable equation numbering:\n", "https://jupyter-contrib-nbextensions.readthedocs.io/en/latest/nbextensions/equation-numbering/readme.html.\n", "\n", - "Automatic Equation Numbering is enabled on http://nbviewer.jupyter.org/,\n", - "see e.g. the latest version of this very notebook at the link http://nbviewer.jupyter.org/github/spatialaudio/nbsphinx/blob/master/doc/markdown-cells.ipynb.\n", + "Automatic Equation Numbering is enabled on https://nbviewer.jupyter.org/,\n", + "see e.g. the latest version of this very notebook at the link https://nbviewer.jupyter.org/github/spatialaudio/nbsphinx/blob/master/doc/markdown-cells.ipynb.\n", "\n", "When using `nbsphinx`, you can use the following `mathjax_config` setting in your `conf.py` file\n", "to enable automatic equation numbering in HTML output.\n", @@ -218,8 +218,12 @@ "\n", "Local image: \n", "\n", + " \n", + "\n", "Remote image: \n", "\n", + " \n", + "\n", "### SVG support for LaTeX\n", "\n", "LaTeX doesn't support SVG images, but there are Sphinx extensions that can be used for automatically converting SVG images for inclusion in LaTeX output.\n", @@ -236,11 +240,23 @@ "\n", "* `'sphinx.ext.imgconverter'`:\n", " This is a built-in Sphinx extension, see\n", - " http://www.sphinx-doc.org/en/master/usage/extensions/imgconverter.html.\n", + " https://www.sphinx-doc.org/en/master/usage/extensions/imgconverter.html.\n", " \n", " This needs the external program `convert` from *ImageMagick*.\n", "\n", - " The disadvantage of this extension is that SVGs are converted to bitmap images." + " The disadvantage of this extension is that SVGs are converted to bitmap images.\n", + "\n", + "If one of those extensions is installed, SVG images can be used even for LaTeX output:\n", + "\n", + "\n", + "\n", + " ", + "\n", + "Remote SVG images can also be used:\n", + "\n", + "\n", + "\n", + " " ] }, { @@ -410,7 +426,7 @@ "source": [ "## Links to `*.rst` Files (and Other Sphinx Source Files)\n", "\n", - "Links to files whose extension is in the configuration value [source_suffix](http://www.sphinx-doc.org/en/master/config.html#confval-source_suffix), will be converted to links to the generated HTML/LaTeX pages. Example: [A reStructuredText file](a-normal-rst-file.rst).\n", + "Links to files whose extension is in the configuration value [source_suffix](https://www.sphinx-doc.org/en/master/config.html#confval-source_suffix), will be converted to links to the generated HTML/LaTeX pages. Example: [A reStructuredText file](a-normal-rst-file.rst).\n", "\n", "This was created with:\n", "\n", @@ -462,7 +478,7 @@ "source": [ "## Links to Domain Objects\n", "\n", - "Links to [Sphinx domain objects](http://www.sphinx-doc.org/en/master/usage/restructuredtext/domains.html) (such as a Python class or JavaScript function) are also possible. For example:\n", + "Links to [Sphinx domain objects](https://www.sphinx-doc.org/en/master/usage/restructuredtext/domains.html) (such as a Python class or JavaScript function) are also possible. For example:\n", "[example_python_function()](a-normal-rst-file.rst#example_python_function).\n", "\n", "This was created with:\n", @@ -471,7 +487,7 @@ "[example_python_function()](a-normal-rst-file.rst#example_python_function)\n", "```\n", "\n", - "This is especially useful for use with the Sphinx [autodoc](http://www.sphinx-doc.org/en/master/ext/autodoc.html) extension!" + "This is especially useful for use with the Sphinx [autodoc](https://www.sphinx-doc.org/en/master/ext/autodoc.html) extension!" ] } ], @@ -491,7 +507,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.7.1" + "version": "3.7.2rc1" } }, "nbformat": 4, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/doc/orphan.ipynb new/nbsphinx-0.4.3/doc/orphan.ipynb --- old/nbsphinx-0.4.2/doc/orphan.ipynb 2018-12-14 18:15:47.000000000 +0100 +++ new/nbsphinx-0.4.3/doc/orphan.ipynb 2019-09-22 17:10:21.000000000 +0200 @@ -15,7 +15,7 @@ "source": [ "# An Orphan Notebook (HTML Only)\n", "\n", - "This means that it doesn't appear in a [toctree](http://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#d...) (see `index.rst`), but other pages can still link to it ...\n", + "This means that it doesn't appear in a [toctree](https://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#...) (see `index.rst`), but other pages can still link to it ...\n", "\n", "* ... from a [Markdown cell of another notebook](markdown-cells.ipynb#Links-to-Other-Notebooks) using\n", "\n", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/doc/pre-executed.ipynb new/nbsphinx-0.4.3/doc/pre-executed.ipynb --- old/nbsphinx-0.4.2/doc/pre-executed.ipynb 2018-12-14 18:15:47.000000000 +0100 +++ new/nbsphinx-0.4.3/doc/pre-executed.ipynb 2019-09-30 15:30:56.000000000 +0200 @@ -123,7 +123,7 @@ "If an exception is raised during the Sphinx build process, it is stopped (the build process, not the exception!).\n", "If you want to show to your audience how an exception looks like, you have two choices:\n", "\n", - "1. Allow errors -- either generally or on a per-notebook basis -- see [Ignoring Errors](allow-errors.ipynb).\n", + "1. Allow errors -- either generally or on a per-notebook or per-cell basis -- see [Ignoring Errors](allow-errors.ipynb) ([per cell](allow-errors-per-cell.ipynb)).\n", "\n", "1. Execute the notebook beforehand and save the results, like it's done in this example notebook:" ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/doc/prolog-and-epilog.ipynb new/nbsphinx-0.4.3/doc/prolog-and-epilog.ipynb --- old/nbsphinx-0.4.2/doc/prolog-and-epilog.ipynb 2018-12-14 18:15:47.000000000 +0100 +++ new/nbsphinx-0.4.3/doc/prolog-and-epilog.ipynb 2019-09-22 17:10:21.000000000 +0200 @@ -18,12 +18,12 @@ "When including notebooks in your Sphinx documentation, you can choose to add some generic content before and after each notebook.\n", "This can be done with the configuration values `nbsphinx_prolog` and `nbsphinx_epilog` in the file `conf.py`.\n", "\n", - "The prolog and epilog strings can hold arbitrary [reST](http://sphinx-doc.org/rest.html) markup.\n", - "Particularly, the [only](http://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#d...) and [raw](https://docutils.readthedocs.io/en/sphinx-docs/ref/rst/directives.html#raw-d...) directives can be used to have different content for HTML and LaTeX output.\n", + "The prolog and epilog strings can hold arbitrary [reST](https://www.sphinx-doc.org/rest.html) markup.\n", + "Particularly, the [only](https://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#...) and [raw](https://docutils.readthedocs.io/en/sphinx-docs/ref/rst/directives.html#raw-d...) directives can be used to have different content for HTML and LaTeX output.\n", "\n", "Those strings are also processed by the [Jinja2](http://jinja.pocoo.org/) templating engine.\n", "This means you can run Python-like code within those strings.\n", - "You have access to the current [Sphinx build environment](http://www.sphinx-doc.org/en/master/extdev/envapi.html) via the variable `env`.\n", + "You have access to the current [Sphinx build environment](https://www.sphinx-doc.org/en/master/extdev/envapi.html) via the variable `env`.\n", "Most notably, you can get the file name of the current notebook with\n", "\n", " {{ env.doc2path(env.docname, base=None) }}\n", @@ -66,7 +66,7 @@ "source": [ "## Examples\n", "\n", - "You can include a simple static string, using [reST](http://sphinx-doc.org/rest.html) markup if you like:\n", + "You can include a simple static string, using [reST](https://www.sphinx-doc.org/rest.html) markup if you like:\n", "\n", "```python\n", "nbsphinx_epilog = \"\"\"\n", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/doc/raw-cells.ipynb new/nbsphinx-0.4.3/doc/raw-cells.ipynb --- old/nbsphinx-0.4.2/doc/raw-cells.ipynb 2018-12-14 18:15:47.000000000 +0100 +++ new/nbsphinx-0.4.3/doc/raw-cells.ipynb 2019-09-22 17:10:21.000000000 +0200 @@ -72,7 +72,7 @@ "source": [ "\"**I'm** a *raw cell* in reST_ format.\"\n", "\n", - ".. _reST: http://sphinx-doc.org/rest.html" + ".. _reST: https://www.sphinx-doc.org/rest.html" ] }, { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/doc/requirements.txt new/nbsphinx-0.4.3/doc/requirements.txt --- old/nbsphinx-0.4.2/doc/requirements.txt 2019-01-15 10:46:01.000000000 +0100 +++ new/nbsphinx-0.4.3/doc/requirements.txt 2019-09-30 15:30:56.000000000 +0200 @@ -1,7 +1,6 @@ -sphinx>=1.6 -nbconvert!=5.4 ipykernel numpy matplotlib pandas sphinxcontrib-bibtex +sphinxcontrib-svg2pdfconverter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/doc/subdir/toctree.ipynb new/nbsphinx-0.4.3/doc/subdir/toctree.ipynb --- old/nbsphinx-0.4.2/doc/subdir/toctree.ipynb 2018-12-14 18:15:47.000000000 +0100 +++ new/nbsphinx-0.4.3/doc/subdir/toctree.ipynb 2019-09-22 17:10:21.000000000 +0200 @@ -15,7 +15,7 @@ "source": [ "# Using `toctree` In A Notebook\n", "\n", - "In Sphinx-based documentation, there is typically a file called `index.rst` which contains one or more [toctree](http://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#d...) directives.\n", + "In Sphinx-based documentation, there is typically a file called `index.rst` which contains one or more [toctree](https://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#...) directives.\n", "Those can be used to pull in further source files (which themselves can contain `toctree` directives).\n", "\n", "With `nbsphinx` it is possible to get a similar effect within a Jupyter notebook using the `\"nbsphinx-toctree\"` cell metadata.\n", @@ -58,7 +58,7 @@ " \"numbered\": true\n", " }\n", "\n", - "For more options, have a look a the [Sphinx documentation](http://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#directive-toctree).\n", + "For more options, have a look a the [Sphinx documentation](https://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#directive-toctree).\n", "All options can be used -- except `:glob:`, which can only be used in [rst files](../a-normal-rst-file.rst) and in [raw reST cells](../raw-cells.ipynb#reST).\n", "\n", "Note that in the HTML output, a `toctree` cell generates an in-line table of contents (containing links) at its position in the notebook, whereas in the LaTeX output, a new (sub-)section with the actual content is inserted at its position.\n", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/doc/usage.ipynb new/nbsphinx-0.4.3/doc/usage.ipynb --- old/nbsphinx-0.4.2/doc/usage.ipynb 2018-12-28 20:32:38.000000000 +0100 +++ new/nbsphinx-0.4.3/doc/usage.ipynb 2019-09-30 15:40:06.000000000 +0200 @@ -22,7 +22,7 @@ "source": [ "## Sphinx Setup\n", "\n", - "In the directory with your notebook files, run this command (assuming you have [Sphinx](http://sphinx-doc.org/) installed already):\n", + "In the directory with your notebook files, run this command (assuming you have [Sphinx](https://www.sphinx-doc.org/) installed already):\n", "\n", " python3 -m sphinx.cmd.quickstart\n", "\n", @@ -41,8 +41,8 @@ "\n", "For an example, see this project's [conf.py](conf.py) file.\n", "\n", - "Once your `conf.py` is in place, edit the file named `index.rst` and add the file names of your notebooks (without the `.ipynb` extension) to the [toctree](http://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#d...) directive.\n", - "For an example, see this project's [index.rst](index.rst) file." + "Once your `conf.py` is in place, edit the file named `index.rst` and add the file names of your notebooks (without the `.ipynb` extension) to the [toctree](https://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#...) directive.\n", + "For an example, see this project's `doc/index.rst` file." ] }, { @@ -178,15 +178,13 @@ "\n", "1. Create the file mentioned above.\n", "You can choose whatever name you want (it may also live in a subdirectory, e.g. `doc/environment.yml`), it just has to match whatever is specified in `readthedocs.yml`.\n", - "The second file describes a [conda environment](https://conda.io/docs/using/envs.html) and should contain something like this:\n", + "The second file describes a [conda environment](https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-envir...) and should contain something like this:\n", "\n", " channels:\n", " - conda-forge\n", " dependencies:\n", " - python>=3\n", - " - sphinx>=1.6\n", " - pandoc\n", - " - nbconvert!=5.4\n", " - ipykernel\n", " - pip:\n", " - nbsphinx\n", @@ -218,7 +216,7 @@ "\n", "**Warning:**\n", "\n", - "If you have a very long repository name (or branch name), you might run into this quite obscure problem: ['placeholder too short'](https://github.com/rtfd/readthedocs.org/issues/1902).\n", + "If you have a very long repository name (or branch name), you might run into this quite obscure problem: ['placeholder too short'](https://github.com/readthedocs/readthedocs.org/issues/1902).\n", "\n", "</div>" ] @@ -229,7 +227,7 @@ "source": [ "## HTML Themes\n", "\n", - "The `nbsphinx` extension does *not* provide its own theme, you can use any of the available themes or [create a custom one](http://www.sphinx-doc.org/en/master/theming.html#creating-themes), if you feel like it.\n", + "The `nbsphinx` extension does *not* provide its own theme, you can use any of the available themes or [create a custom one](https://www.sphinx-doc.org/en/master/theming.html#creating-themes), if you feel like it.\n", "\n", "The following (incomplete) list of themes contains up to three links for each theme:\n", "\n", @@ -239,49 +237,53 @@ "\n", "### Sphinx's Built-In Themes\n", "\n", + "* `agogo`:\n", + " [example](https://nbsphinx.readthedocs.io/en/agogo-theme/),\n", + " [usage](https://github.com/spatialaudio/nbsphinx/compare/agogo-theme^...agogo-theme)\n", + "\n", "* [alabaster](https://alabaster.readthedocs.io/):\n", " [example](https://nbsphinx.readthedocs.io/en/alabaster-theme/),\n", " [usage](https://github.com/spatialaudio/nbsphinx/compare/alabaster-theme^...alabaster-theme)\n", "\n", - "* `pyramid`:\n", - " [example](https://nbsphinx.readthedocs.io/en/pyramid-theme/),\n", - " [usage](https://github.com/spatialaudio/nbsphinx/compare/pyramid-theme^...pyramid-theme)\n", + "* `bizstyle`:\n", + " [example](https://nbsphinx.readthedocs.io/en/bizstyle-theme/),\n", + " [usage](https://github.com/spatialaudio/nbsphinx/compare/bizstyle-theme^...bizstyle-theme)\n", "\n", "* `classic`:\n", " [example](https://nbsphinx.readthedocs.io/en/classic-theme/),\n", " [usage](https://github.com/spatialaudio/nbsphinx/compare/classic-theme^...classic-theme)\n", "\n", - "* `bizstyle`:\n", - " [example](https://nbsphinx.readthedocs.io/en/bizstyle-theme/),\n", - " [usage](https://github.com/spatialaudio/nbsphinx/compare/bizstyle-theme^...bizstyle-theme)\n", - "\n", "* `haiku`:\n", " [example](https://nbsphinx.readthedocs.io/en/haiku-theme/),\n", " [usage](https://github.com/spatialaudio/nbsphinx/compare/haiku-theme^...haiku-theme)\n", "\n", - "* `traditional`:\n", - " [example](https://nbsphinx.readthedocs.io/en/traditional-theme/),\n", - " [usage](https://github.com/spatialaudio/nbsphinx/compare/traditional-theme^...traditional-theme)\n", - "\n", - "* `agogo`:\n", - " [example](https://nbsphinx.readthedocs.io/en/agogo-theme/),\n", - " [usage](https://github.com/spatialaudio/nbsphinx/compare/agogo-theme^...agogo-theme)\n", - "\n", "* `nature`:\n", " [example](https://nbsphinx.readthedocs.io/en/nature-theme/),\n", " [usage](https://github.com/spatialaudio/nbsphinx/compare/nature-theme^...nature-theme)\n", "\n", + "* `pyramid`:\n", + " [example](https://nbsphinx.readthedocs.io/en/pyramid-theme/),\n", + " [usage](https://github.com/spatialaudio/nbsphinx/compare/pyramid-theme^...pyramid-theme)\n", + "\n", "* `scrolls`:\n", " [example](https://nbsphinx.readthedocs.io/en/scrolls-theme/),\n", " [usage](https://github.com/spatialaudio/nbsphinx/compare/scrolls-theme^...scrolls-theme)\n", "\n", + "* `traditional`:\n", + " [example](https://nbsphinx.readthedocs.io/en/traditional-theme/),\n", + " [usage](https://github.com/spatialaudio/nbsphinx/compare/traditional-theme^...traditional-theme)\n", + "\n", "### 3rd-Party Themes\n", "\n", - "* [sphinx_rtd_theme](https://github.com/rtfd/sphinx_rtd_theme):\n", - " [example](https://nbsphinx.readthedocs.io/en/rtd-theme/),\n", - " [usage](https://github.com/spatialaudio/nbsphinx/compare/rtd-theme^...rtd-theme)\n", + "* [basicstrap](https://pythonhosted.org/sphinxjp.themes.basicstrap/):\n", + " [example](https://nbsphinx.readthedocs.io/en/basicstrap-theme/),\n", + " [usage](https://github.com/spatialaudio/nbsphinx/compare/basicstrap-theme^...basicstrap-theme)\n", "\n", - "* [bootstrap](http://sphinx-bootstrap-theme.readthedocs.io/):\n", + "* [better](https://sphinx-better-theme.readthedocs.io/):\n", + " [example](https://nbsphinx.readthedocs.io/en/better-theme/),\n", + " [usage](https://github.com/spatialaudio/nbsphinx/compare/better-theme^...better-theme)\n", + "\n", + "* [bootstrap](https://sphinx-bootstrap-theme.readthedocs.io/):\n", " [example](https://nbsphinx.readthedocs.io/en/bootstrap-theme/),\n", " [usage](https://github.com/spatialaudio/nbsphinx/compare/bootstrap-theme^...bootstrap-theme)\n", "\n", @@ -289,22 +291,10 @@ " [example](https://nbsphinx.readthedocs.io/en/cloud-theme/),\n", " [usage](https://github.com/spatialaudio/nbsphinx/compare/cloud-theme^...cloud-theme)\n", "\n", - "* [sphinx_py3doc_enhanced_theme](https://github.com/ionelmc/sphinx-py3doc-enhanced-theme):\n", - " [example](https://nbsphinx.readthedocs.io/en/py3doc-enhanced-theme/),\n", - " [usage](https://github.com/spatialaudio/nbsphinx/compare/py3doc-enhanced-theme^...py3doc-enhanced-theme)\n", - "\n", - "* [basicstrap](https://pythonhosted.org/sphinxjp.themes.basicstrap/):\n", - " [example](https://nbsphinx.readthedocs.io/en/basicstrap-theme/),\n", - " [usage](https://github.com/spatialaudio/nbsphinx/compare/basicstrap-theme^...basicstrap-theme)\n", - "\n", "* [dotted](https://pythonhosted.org/sphinxjp.themes.dotted/):\n", " [example](https://nbsphinx.readthedocs.io/en/dotted-theme/),\n", " [usage](https://github.com/spatialaudio/nbsphinx/compare/dotted-theme^...dotted-theme)\n", "\n", - "* [better](https://sphinx-better-theme.readthedocs.io/):\n", - " [example](https://nbsphinx.readthedocs.io/en/better-theme/),\n", - " [usage](https://github.com/spatialaudio/nbsphinx/compare/better-theme^...better-theme)\n", - "\n", "* [guzzle_sphinx_theme](https://github.com/guzzle/guzzle_sphinx_theme):\n", " [example](https://nbsphinx.readthedocs.io/en/guzzle-theme/),\n", " [usage](https://github.com/spatialaudio/nbsphinx/compare/guzzle-theme^...guzzle-theme)\n", @@ -317,6 +307,18 @@ " [example](https://nbsphinx.readthedocs.io/en/jupyter-theme/),\n", " [usage](https://github.com/spatialaudio/nbsphinx/compare/jupyter-theme^...jupyter-theme)\n", "\n", + "* [sizzle_sphinx_theme](https://docs.red-dove.com/sphinx_sizzle_theme/):\n", + " [example](https://nbsphinx.readthedocs.io/en/sizzle-theme/),\n", + " [usage](https://github.com/spatialaudio/nbsphinx/compare/sizzle-theme^...sizzle-theme)\n", + "\n", + "* [sphinx_py3doc_enhanced_theme](https://github.com/ionelmc/sphinx-py3doc-enhanced-theme):\n", + " [example](https://nbsphinx.readthedocs.io/en/py3doc-enhanced-theme/),\n", + " [usage](https://github.com/spatialaudio/nbsphinx/compare/py3doc-enhanced-theme^...py3doc-enhanced-theme)\n", + "\n", + "* [sphinx_rtd_theme](https://github.com/readthedocs/sphinx_rtd_theme):\n", + " [example](https://nbsphinx.readthedocs.io/en/rtd-theme/),\n", + " [usage](https://github.com/spatialaudio/nbsphinx/compare/rtd-theme^...rtd-theme)\n", + "\n", "If you know of another Sphinx theme that should be included here, please open an [issue on Github](https://github.com/spatialaudio/nbsphinx/issues).\n", "An overview of many more themes can be found at https://sphinx-themes.org/." ] @@ -348,10 +350,11 @@ "\n", "* https://github.com/kynan/nbstripout\n", "* https://github.com/toobaz/ipynb_output_filter\n", - "* http://tillahoffmann.github.io/2017/04/17/versioning-jupyter-notebooks-with-git.html\n", + "* https://tillahoffmann.github.io/2017/04/17/versioning-jupyter-notebooks-with-git.html\n", "* http://timstaley.co.uk/posts/making-git-and-jupyter-notebooks-play-nice/\n", - "* http://pascalbugnion.net/blog/ipython-notebooks-and-git.html\n", - "* https://github.com/choldgraf/nbclean" + "* https://pascalbugnion.net/blog/ipython-notebooks-and-git.html\n", + "* https://github.com/choldgraf/nbclean\n", + "* https://jamesfolberth.org/articles/2017/08/07/git-commit-hook-for-jupyter-no..." ] } ], @@ -371,9 +374,9 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.7.2rc1" + "version": "3.7.4" } }, "nbformat": 4, - "nbformat_minor": 2 + "nbformat_minor": 4 } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/setup.py new/nbsphinx-0.4.3/setup.py --- old/nbsphinx-0.4.2/setup.py 2018-12-14 18:15:47.000000000 +0100 +++ new/nbsphinx-0.4.3/setup.py 2019-09-30 15:30:56.000000000 +0200 @@ -18,7 +18,7 @@ 'nbconvert!=5.4', 'traitlets', 'nbformat', - 'sphinx>=1.6', + 'sphinx>=1.6.3', ], author='Matthias Geier', author_email='Matthias.Geier@gmail.com', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/src/nbsphinx.egg-info/PKG-INFO new/nbsphinx-0.4.3/src/nbsphinx.egg-info/PKG-INFO --- old/nbsphinx-0.4.2/src/nbsphinx.egg-info/PKG-INFO 2019-01-15 10:51:01.000000000 +0100 +++ new/nbsphinx-0.4.3/src/nbsphinx.egg-info/PKG-INFO 2019-09-30 15:45:36.000000000 +0200 @@ -1,6 +1,6 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.2 Name: nbsphinx -Version: 0.4.2 +Version: 0.4.3 Summary: Jupyter Notebook Tools for Sphinx Home-page: UNKNOWN Author: Matthias Geier @@ -38,8 +38,8 @@ License: MIT -- see the file ``LICENSE`` for details. - .. _Sphinx: http://sphinx-doc.org/ - .. _Jupyter Notebook: http://jupyter.org/ + .. _Sphinx: https://www.sphinx-doc.org/ + .. _Jupyter Notebook: https://jupyter.org/ Keywords: Sphinx,Jupyter,notebook Platform: any diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/src/nbsphinx.egg-info/SOURCES.txt new/nbsphinx-0.4.3/src/nbsphinx.egg-info/SOURCES.txt --- old/nbsphinx-0.4.2/src/nbsphinx.egg-info/SOURCES.txt 2019-01-15 10:51:01.000000000 +0100 +++ new/nbsphinx-0.4.3/src/nbsphinx.egg-info/SOURCES.txt 2019-09-30 15:45:36.000000000 +0200 @@ -6,6 +6,7 @@ setup.cfg setup.py doc/a-normal-rst-file.rst +doc/allow-errors-per-cell.ipynb doc/allow-errors.ipynb doc/code-cells.ipynb doc/conf.py @@ -26,6 +27,7 @@ doc/usage.ipynb doc/yet-another.ipynb doc/images/notebook_icon.png +doc/images/python_logo.svg doc/images/raw_cells.png doc/subdir/a-notebook-in-a-subdir.ipynb doc/subdir/toctree.ipynb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/src/nbsphinx.egg-info/requires.txt new/nbsphinx-0.4.3/src/nbsphinx.egg-info/requires.txt --- old/nbsphinx-0.4.2/src/nbsphinx.egg-info/requires.txt 2019-01-15 10:51:01.000000000 +0100 +++ new/nbsphinx-0.4.3/src/nbsphinx.egg-info/requires.txt 2019-09-30 15:45:36.000000000 +0200 @@ -2,5 +2,5 @@ jinja2 nbconvert!=5.4 nbformat -sphinx>=1.6 +sphinx>=1.6.3 traitlets diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbsphinx-0.4.2/src/nbsphinx.py new/nbsphinx-0.4.3/src/nbsphinx.py --- old/nbsphinx-0.4.2/src/nbsphinx.py 2019-01-15 10:47:27.000000000 +0100 +++ new/nbsphinx-0.4.3/src/nbsphinx.py 2019-09-30 15:37:41.000000000 +0200 @@ -20,10 +20,10 @@ """Jupyter Notebook Tools for Sphinx. -http://nbsphinx.readthedocs.io/ +https://nbsphinx.readthedocs.io/ """ -__version__ = '0.4.2' +__version__ = '0.4.3' import copy import json @@ -76,7 +76,6 @@ RST_TEMPLATE = """ {% extends 'rst.tpl' %} - {% macro insert_empty_lines(text) %} {%- set before, after = text | get_empty_lines %} {%- if before %} @@ -1563,6 +1562,16 @@ for suffix in app.config.nbsphinx_custom_formats: app.add_source_suffix(suffix, 'jupyter_notebook') + if app.config.nbsphinx_requirejs_path: + try: + # TODO: Add only on pages created from notebooks? + app.add_js_file( + app.config.nbsphinx_requirejs_path, + **app.config.nbsphinx_requirejs_options) + except AttributeError: + # For Sphinx < 1.8 (nbsphinx_requirejs_options are ignored): + app.add_javascript(app.config.nbsphinx_requirejs_path) + def html_page_context(app, pagename, templatename, context, doctree): """Add CSS string to HTML pages that contain code cells.""" @@ -1645,7 +1654,7 @@ out.append( r'\sphinxsetup{VerbatimBorderColor={named}{nbsphinx-code-border}}') - if lines[1].startswith(r'\fvset{'): # Sphinx >= 1.6.6 + if lines[1].startswith(r'\fvset{'): # Sphinx >= 1.6.6 and < 1.8.3 out.append(lines[1]) del lines[1] assert 'Verbatim' in lines[1] @@ -1768,6 +1777,16 @@ app.add_config_value('nbsphinx_input_prompt', '[%s]:', rebuild='env') app.add_config_value('nbsphinx_output_prompt', '[%s]:', rebuild='env') app.add_config_value('nbsphinx_custom_formats', {}, rebuild='env') + app.add_config_value( + 'nbsphinx_requirejs_path', + 'https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js', + rebuild='html') + app.add_config_value( + 'nbsphinx_requirejs_options', + { + 'integrity': 'sha256-Ae2Vz/4ePdIu6ZyI/5ZGsYnb+m0JlOmKPjt6XZ9JJkA=', + 'crossorigin': 'anonymous', + }, rebuild='html') app.add_directive('nbinput', NbInput) app.add_directive('nboutput', NbOutput)