Accepting request 943335 from devel:languages:python:jupyter

OBS-URL: https://build.opensuse.org/request/show/943335
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-nbconvert?expand=0&rev=9

mistune-0.8.4.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e
+size 58322

nbconvert-vendorize-mistune.patch

@@ -0,0 +1,25 @@
+Index: nbconvert-6.0.7/nbconvert/filters/markdown_mistune.py
+===================================================================
+--- nbconvert-6.0.7.orig/nbconvert/filters/markdown_mistune.py
++++ nbconvert-6.0.7/nbconvert/filters/markdown_mistune.py
+@@ -18,7 +18,7 @@ except ImportError:
+     # Python 2
+     from cgi import escape as html_escape
+ 
+-import mistune
++from nbconvert.vendor import mistune
+ 
+ from pygments import highlight
+ from pygments.lexers import get_lexer_by_name
+Index: nbconvert-6.0.7/setup.py
+===================================================================
+--- nbconvert-6.0.7.orig/setup.py
++++ nbconvert-6.0.7/setup.py
+@@ -212,7 +212,6 @@ setup_args = dict(
+ )
+ 
+ setup_args['install_requires'] = [
+-    'mistune>=0.8.1,<2',
+     'jinja2>=2.4',
+     'pygments>=2.4.1',
+     'jupyterlab_pygments',

python-nbconvert.changes

@@ -1,3 +1,74 @@
+-------------------------------------------------------------------
+Fri Dec 31 16:28:25 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Revert to 6.0.7
+  * We can't have a newer version without traitlets 5. But we
+    can't have traitlets 5 as long as python36 is active
+- Vendorize mistune 0.8.4
+  * Add nbconvert-vendorize-mistune.patch
+  * gh#jupyter/nbconvert#1685
+- Alternativize flavored entry-point. For 6.3: do it with dejavu
+
+-------------------------------------------------------------------
+Thu Dec 30 18:01:32 UTC 2021 - Matej Cepl <mcepl@suse.com>
+
+- Upgrade to the version 6.3.0:
+  - Bugfixes:
+    - Update state filter
+    - Add slide numbering
+    - Fix HTML templates mentioned in help docs
+    - Add the ability to fully customize widget_renderer_url
+    - Enable users to customize MathJax URLs
+    - Add CLI configuration for disable-chromium-sandbox
+    - Enables webpdf to be rendered with templates
+    - Adds dejavu
+  - Significant Changes¶
+    - Dropped Python 3.6 and added Python 3.9
+    - Convert execute preprocessor wrapper to resemble papermill
+  - Comprehensive notes¶
+    - Feature: support static widgets in Reveal.js slides PR
+      #1553:
+    - Feature: add speaker notes to Reveal.js template
+    - Add correct output mimetype to WebPDF exporter
+    - Set mimetype for webpdf correctly
+    - Fix docstring issue and a broken link
+    - Add CLI example for removing cell tag syntax
+    - Include output of stdin stream in lab template
+    - Don’t use a shell to call inkscape
+    - JupyterLab export as HTML with widgets fails to load
+      widgets
+    - Move note inside Reveal.js HTML slideshow
+    - fix issue 1507: broken command line option
+      –CSSHTMLHeaderPreprocessor.style=
+    - Fix order of template paths
+    - Changed documentation of external_exporters
+    - Fix template precedence when using a custom template
+    - add pip to docs envt
+    - Fix CI By Adding PIP to conda envt for docs build
+    - Explicitly install pip in docs environment.yml
+    - small update to docs hide cell
+    - Allow child templates to override mathjax
+    - Allow get_export_names to skip configuration check
+    - Update docs: Tex Live package on Ubuntu
+    - Test jupyter_client
+    - Update jupyterlab css
+    - Webpdf: Use a temporary file instead of an URL
+    - Applied patch for marking network changes
+    - Change webpdf display name
+    - Allow disabling pyppeteer sandbox
+    - Make pagination configurable in webpdf
+    - Fix Reveal.js version in documentation
+    - Fix dangling reference to get_template_paths()
+    - Solved svg2pdf conversion error if Inkscape is installed
+      into the default path on a windows machine
+    - Update version dependency of traitlets
+    - Update execute.py
+    - Fix code output indentation when running nbconvert
+      –no-input
+    - #1428 add docstring
+    - Update nbconvert_library.ipynb
+    - Supports isolated iframe when converting to HTML
+
 -------------------------------------------------------------------
 Sat Oct 30 17:35:42 UTC 2021 - Ben Greiner <code@bnavigator.de>
 

python-nbconvert.spec

@@ -38,6 +38,10 @@ URL:            https://github.com/jupyter/nbconvert
 Source0:        https://files.pythonhosted.org/packages/source/n/nbconvert/nbconvert-%{version}.tar.gz
 Source1:        https://media.readthedocs.org/pdf/nbconvert/%{doc_ver}/nbconvert.pdf
 Source2:        https://media.readthedocs.org/htmlzip/nbconvert/%{doc_ver}/nbconvert.zip
+# License Source3: BSD-3-Clause
+Source3:        https://files.pythonhosted.org/packages/source/m/mistune/mistune-0.8.4.tar.gz
+# PATCH-FIX-OPENSUSE nbconvert-vendorize-mistune.patch -- gh#jupyter/nbconvert#1685
+Patch1:         nbconvert-vendorize-mistune.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -57,6 +61,13 @@ Requires:       python-nbformat >= 4.4
 Requires:       python-pandocfilters >= 1.4.1
 Requires:       python-testpath
 Requires:       python-traitlets >= 4.2
+%if %{with libalternatives}
+Requires:       alts
+BuildRequires:  alts
+%else
+Requires(post): update-alternatives
+Requires(postun):update-alternatives
+%endif
 Recommends:     pandoc
 Recommends:     python-tornado >= 4.0
 Suggests:       %{name}-latex
@@ -137,9 +148,12 @@ Obsoletes:      %{python_module jupyter_nbconvert-doc < %{version}}
 Documentation and help files for Jupyter's notebook converter.
 
 %prep
-%autosetup -p1 -n nbconvert-%{version}
+%autosetup -p1 -n nbconvert-%{version} -b3
 
 cp %{SOURCE1} .
+mkdir nbconvert/vendor
+touch nbconvert/vendor/__init__.py
+cp ../mistune-0.8.4/mistune.py nbconvert/vendor/
 unzip %{SOURCE2} -d docs
 mv docs/nbconvert-* docs/html
 rm docs/html/.buildinfo
@@ -156,6 +170,8 @@ sed -i -e "/nbclient/ s/,<.*'/'/" setup.py
 %if ! %{with test}
 %python_install
 
+%python_clone -a %{buildroot}%{_bindir}/jupyter-nbconvert
+
 mkdir -p %{buildroot}%{_docdir}/jupyter-nbconvert
 
 cp %{SOURCE1} %{buildroot}%{_docdir}/jupyter-nbconvert/
@@ -171,21 +187,31 @@ pushd docs
 export LANG=en_US.UTF-8
 %{python_expand # installed package in :test flavor
 $python -B -m ipykernel.kernelspec --user
-pytest-%{$python_bin_suffix} -v -k 'not test_webpdf' --pyargs nbconvert
+# not test_webpdf: no pyppeteer, not even offline
+pytest-%{$python_bin_suffix} -v -m 'not network' -k "not test_webpdf" --pyargs nbconvert
 }
 popd
 %endif
 
-%if ! %{with test}
+%if !%{with test}
+%pre
+%python_libalternatives_reset_alternative jupyter-nbconvert
+
+%post
+%python_install_alternative jupyter-nbconvert
+
+%postun
+%python_uninstall_alternative jupyter-nbconvert
+
 %files %{python_files}
 %license LICENSE
 %doc README.md
 %{python_sitelib}/nbconvert-%{version}-py*.egg-info
 %{python_sitelib}/nbconvert/
+%python_alternative %{_bindir}/jupyter-nbconvert
 
 %files -n jupyter-nbconvert
 %license LICENSE
-%{_bindir}/jupyter-nbconvert
 %dir %{_datadir}/jupyter/
 %dir %{_datadir}/jupyter/nbconvert
 %{_datadir}/jupyter/nbconvert/templates