From bf2be8b3b03e0a4c035fcff28b0fc03896459493b47b1adf6162eaa2fa3d4746 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sat, 12 Mar 2022 20:59:43 +0000 Subject: [PATCH] Accepting request 961330 from home:apersaud:branches:devel:languages:python:jupyter - specfile: * update nbconvert-vendorize-mistune.patch (linenumbers changed and lines before patch) * require beautiful-soup - update to version 6.4.4: * HTMLExporter: Respect the embed_images flag for HTML blocks PR #1721 - changes from version 6.4.3: * Remove ipython genutils PR #1727 * Add section to customizing showing how to use template inheritance PR #1719 OBS-URL: https://build.opensuse.org/request/show/961330 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbconvert?expand=0&rev=36 --- nbconvert-6.4.2.tar.gz | 3 --- nbconvert-6.4.4.tar.gz | 3 +++ nbconvert-vendorize-mistune.patch | 8 ++++---- python-nbconvert.changes | 16 ++++++++++++++++ python-nbconvert.spec | 4 +++- 5 files changed, 26 insertions(+), 8 deletions(-) delete mode 100644 nbconvert-6.4.2.tar.gz create mode 100644 nbconvert-6.4.4.tar.gz diff --git a/nbconvert-6.4.2.tar.gz b/nbconvert-6.4.2.tar.gz deleted file mode 100644 index 267ad25..0000000 --- a/nbconvert-6.4.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb2803db18f6facce6bf3b01b684fe47907994bd156d15eaccdf011e3d7f8164 -size 902691 diff --git a/nbconvert-6.4.4.tar.gz b/nbconvert-6.4.4.tar.gz new file mode 100644 index 0000000..79a06b2 --- /dev/null +++ b/nbconvert-6.4.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee0dfe34bbd1082ac9bfc750aae3c73fcbc34a70c5574c6986ff83c10a3541fd +size 906988 diff --git a/nbconvert-vendorize-mistune.patch b/nbconvert-vendorize-mistune.patch index a4af2ed..68c7bc9 100644 --- a/nbconvert-vendorize-mistune.patch +++ b/nbconvert-vendorize-mistune.patch @@ -2,9 +2,9 @@ Index: nbconvert-6.3.0/nbconvert/filters/markdown_mistune.py =================================================================== --- nbconvert-6.3.0.orig/nbconvert/filters/markdown_mistune.py +++ nbconvert-6.3.0/nbconvert/filters/markdown_mistune.py -@@ -18,7 +18,7 @@ except ImportError: - # Python 2 - from cgi import escape as html_escape +@@ -23,7 +23,7 @@ except ImportError: + + import bs4 -import mistune +from nbconvert.vendor import mistune @@ -15,7 +15,7 @@ Index: nbconvert-6.3.0/setup.py =================================================================== --- nbconvert-6.3.0.orig/setup.py +++ nbconvert-6.3.0/setup.py -@@ -212,7 +212,6 @@ setup_args = dict( +@@ -214,7 +214,6 @@ setup_args = dict( ) setup_args['install_requires'] = [ diff --git a/python-nbconvert.changes b/python-nbconvert.changes index 1a7740b..8dfd6ff 100644 --- a/python-nbconvert.changes +++ b/python-nbconvert.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sat Mar 12 04:50:52 UTC 2022 - Arun Persaud + +- specfile: + * update nbconvert-vendorize-mistune.patch (linenumbers changed and lines before patch) + * require beautiful-soup + +- update to version 6.4.4: + * HTMLExporter: Respect the embed_images flag for HTML blocks PR + #1721 + +- changes from version 6.4.3: + * Remove ipython genutils PR #1727 + * Add section to customizing showing how to use template inheritance + PR #1719 + ------------------------------------------------------------------- Sat Feb 19 03:07:52 UTC 2022 - Arun Persaud diff --git a/python-nbconvert.spec b/python-nbconvert.spec index c4b2afa..35f9fef 100644 --- a/python-nbconvert.spec +++ b/python-nbconvert.spec @@ -32,7 +32,7 @@ %{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 Name: python-nbconvert%{psuffix} -Version: 6.4.2 +Version: 6.4.4 Release: 0 Summary: Conversion of Jupyter Notebooks License: BSD-3-Clause @@ -43,6 +43,7 @@ Source3: https://files.pythonhosted.org/packages/source/m/mistune/mistune # PATCH-FIX-OPENSUSE nbconvert-vendorize-mistune.patch -- gh#jupyter/nbconvert#1685 Patch1: nbconvert-vendorize-mistune.patch BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module beautifulsoup4} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -50,6 +51,7 @@ BuildRequires: unzip Requires: jupyter-nbconvert = %{version} Requires: python-Jinja2 >= 2.4 Requires: python-Pygments >= 2.4.1 +Requires: python-beautifulsoup4 Requires: python-bleach Requires: python-defusedxml Requires: python-entrypoints >= 0.2.2