From d566a91d0d13b261b5e9c7465c8d42fa2a92c5fef1656c4ac94eeb61d2324067 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Thu, 6 Jan 2022 10:55:22 +0000 Subject: [PATCH] Accepting request 944204 from home:bnavigator:branches:devel:languages:python:jupyter - Now update to 6.3.0 * traitlets 5 is ready * for changelog see below OBS-URL: https://build.opensuse.org/request/show/944204 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbconvert?expand=0&rev=32 --- nbconvert-6.0.7.tar.gz | 3 -- nbconvert-6.3.0.tar.gz | 3 ++ nbconvert-vendorize-mistune.patch | 12 ++++---- python-nbconvert.changes | 7 +++++ python-nbconvert.spec | 50 +++++++++++++------------------ 5 files changed, 36 insertions(+), 39 deletions(-) delete mode 100644 nbconvert-6.0.7.tar.gz create mode 100644 nbconvert-6.3.0.tar.gz diff --git a/nbconvert-6.0.7.tar.gz b/nbconvert-6.0.7.tar.gz deleted file mode 100644 index 21766db..0000000 --- a/nbconvert-6.0.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002 -size 896833 diff --git a/nbconvert-6.3.0.tar.gz b/nbconvert-6.3.0.tar.gz new file mode 100644 index 0000000..1c1d7d2 --- /dev/null +++ b/nbconvert-6.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e77d6203854944520105e38f2563a813a4a3708e8563aa598928a3b5ee1081a +size 900850 diff --git a/nbconvert-vendorize-mistune.patch b/nbconvert-vendorize-mistune.patch index 2efbafa..a4af2ed 100644 --- a/nbconvert-vendorize-mistune.patch +++ b/nbconvert-vendorize-mistune.patch @@ -1,7 +1,7 @@ -Index: nbconvert-6.0.7/nbconvert/filters/markdown_mistune.py +Index: nbconvert-6.3.0/nbconvert/filters/markdown_mistune.py =================================================================== ---- nbconvert-6.0.7.orig/nbconvert/filters/markdown_mistune.py -+++ nbconvert-6.0.7/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 @@ -11,10 +11,10 @@ Index: nbconvert-6.0.7/nbconvert/filters/markdown_mistune.py from pygments import highlight from pygments.lexers import get_lexer_by_name -Index: nbconvert-6.0.7/setup.py +Index: nbconvert-6.3.0/setup.py =================================================================== ---- nbconvert-6.0.7.orig/setup.py -+++ nbconvert-6.0.7/setup.py +--- nbconvert-6.3.0.orig/setup.py ++++ nbconvert-6.3.0/setup.py @@ -212,7 +212,6 @@ setup_args = dict( ) diff --git a/python-nbconvert.changes b/python-nbconvert.changes index ffd0784..eaf0665 100644 --- a/python-nbconvert.changes +++ b/python-nbconvert.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 31 16:57:55 UTC 2021 - Ben Greiner + +- Now update to 6.3.0 + * traitlets 5 is ready + * for changelog see below + ------------------------------------------------------------------- Fri Dec 31 16:28:25 UTC 2021 - Ben Greiner diff --git a/python-nbconvert.spec b/python-nbconvert.spec index 9feec4b..3ced4f6 100644 --- a/python-nbconvert.spec +++ b/python-nbconvert.spec @@ -1,5 +1,5 @@ # -# spec file for package python-nbconvert +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -25,12 +25,18 @@ %bcond_with test %endif -# Note: only update to > 6.0 when there is no python36 Jupyter stack anymore +%if 0%{?suse_version} > 1500 +%bcond_without libalternatives +%else +%bcond_with libalternatives +%endif + %{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 -%define doc_ver 6.0.7 +%define skip_python36 1 +%define doc_ver 6.3.0 Name: python-nbconvert%{psuffix} -Version: 6.0.7 +Version: 6.3.0 Release: 0 Summary: Conversion of Jupyter Notebooks License: BSD-3-Clause @@ -47,19 +53,18 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: unzip Requires: jupyter-nbconvert = %{version} -Requires: python-Jinja2 -Requires: python-Pygments +Requires: python-Jinja2 >= 2.4 +Requires: python-Pygments >= 2.4.1 Requires: python-bleach Requires: python-defusedxml Requires: python-entrypoints >= 0.2.2 -Requires: python-jupyter-client >= 5.3.1 Requires: python-jupyter-core Requires: python-jupyterlab-pygments Requires: python-nbclient >= 0.5 Requires: python-nbformat >= 4.4 Requires: python-pandocfilters >= 1.4.1 Requires: python-testpath -Requires: python-traitlets >= 4.2 +Requires: python-traitlets >= 5.0 %if %{with libalternatives} Requires: alts BuildRequires: alts @@ -74,26 +79,10 @@ Provides: python-jupyter_nbconvert = %{version} Obsoletes: python-jupyter_nbconvert < %{version} BuildArch: noarch %if %{with test} -BuildRequires: %{python_module Jinja2} -BuildRequires: %{python_module Pebble} -BuildRequires: %{python_module Pygments} -BuildRequires: %{python_module bleach} -BuildRequires: %{python_module defusedxml} -BuildRequires: %{python_module entrypoints >= 0.2.2} BuildRequires: %{python_module ipykernel} -BuildRequires: %{python_module ipywidgets} -BuildRequires: %{python_module jupyter-client >= 5.3.1} -BuildRequires: %{python_module jupyter-core} -BuildRequires: %{python_module jupyterlab-pygments} -BuildRequires: %{python_module mock} -BuildRequires: %{python_module nbclient >= 0.5} -BuildRequires: %{python_module nbconvert} -BuildRequires: %{python_module nbformat >= 4.4} -BuildRequires: %{python_module pandocfilters >= 1.4.1} -BuildRequires: %{python_module pytest} -BuildRequires: %{python_module testpath} -BuildRequires: %{python_module tornado >= 4.0} -BuildRequires: %{python_module traitlets >= 4.2} +BuildRequires: %{python_module ipywidgets >= 7} +BuildRequires: %{python_module nbconvert = %{version}} +BuildRequires: %{python_module pytest-dependency} %endif %python_subpackages @@ -106,7 +95,6 @@ This package provides the python interface. %package -n jupyter-nbconvert Summary: Conversion of Jupyter Notebooks Requires: jupyter-ipykernel -Requires: jupyter-jupyter-client >= 4.2 Requires: jupyter-jupyter-core Requires: jupyter-nbformat >= 4.4 Requires: python3-nbconvert = %{version} @@ -169,6 +157,7 @@ sed -i -e "/nbclient/ s/,<.*'/'/" setup.py %python_install %python_clone -a %{buildroot}%{_bindir}/jupyter-nbconvert +%python_clone -a %{buildroot}%{_bindir}/jupyter-dejavu mkdir -p %{buildroot}%{_docdir}/jupyter-nbconvert @@ -196,7 +185,7 @@ popd %python_libalternatives_reset_alternative jupyter-nbconvert %post -%python_install_alternative jupyter-nbconvert +%python_install_alternative jupyter-nbconvert jupyter-dejavu %postun %python_uninstall_alternative jupyter-nbconvert @@ -204,9 +193,10 @@ popd %files %{python_files} %license LICENSE %doc README.md -%{python_sitelib}/nbconvert-%{version}-py*.egg-info +%{python_sitelib}/nbconvert-%{version}*-info %{python_sitelib}/nbconvert/ %python_alternative %{_bindir}/jupyter-nbconvert +%python_alternative %{_bindir}/jupyter-dejavu %files -n jupyter-nbconvert %license LICENSE