diff --git a/nbconvert-5.6.1.tar.gz b/nbconvert-5.6.1.tar.gz deleted file mode 100644 index db86116..0000000 --- a/nbconvert-5.6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21fb48e700b43e82ba0e3142421a659d7739b65568cc832a13976a77be16b523 -size 703233 diff --git a/nbconvert-6.0.7.tar.gz b/nbconvert-6.0.7.tar.gz new file mode 100644 index 0000000..21766db --- /dev/null +++ b/nbconvert-6.0.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002 +size 896833 diff --git a/nbconvert.pdf b/nbconvert.pdf index da6883c..23f696b 100644 --- a/nbconvert.pdf +++ b/nbconvert.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba4aea00767c810d1d04f6593f9ce9ac4e04af039bca95e5ad546b36b0c503d7 -size 528046 +oid sha256:720196ba36473e3fa6bcbb79b1463640730e0e007acb07aba73cfd9adacae0de +size 548761 diff --git a/nbconvert.zip b/nbconvert.zip index 813ac52..1b74f30 100644 --- a/nbconvert.zip +++ b/nbconvert.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16aa63a46e98e3c3bd2c265746b6d126c66dca5ff9369035e645eefaf3aa76e5 -size 9074928 +oid sha256:fbc32a1803eabb59acee50b81e705fe11c285ff42b7a99e7d4c68b3bc0bd1507 +size 8652426 diff --git a/python-nbconvert.changes b/python-nbconvert.changes index e71b3b0..d4b3127 100644 --- a/python-nbconvert.changes +++ b/python-nbconvert.changes @@ -1,3 +1,70 @@ +------------------------------------------------------------------- +Thu Feb 25 21:11:07 UTC 2021 - Matej Cepl + +- Update to 6.0.7: + - 6.0.7 + - Primarly a release addressing template extensions issues reported + since 6.0 launched. + - 6.0.6 + - A range of bug fixes for webpdf exports + - 6.0.5 + - Revert networkidle2 change which caused custom cdn-fetched widgets + in webpdf + - 6.0.4 + - Bugfixes only + - 6.0.3 + - Execute preprocessor no longer add illegal execution counts to + markdown cells :ghpull:`1396`: + - 6.0.2 + - A patch for a few minor issues raised out of the 6.0 release. + - 6.0.1 + - A quick patch to fix an issue with get_exporter :ghpull:`1367`: + - 6.0 + - Nbconvert 6.0 is a major release of nbconvert which includes many + significant changes. + - Python 2 support was dropped. Currently Python 3.6-3.8 is + supported and tested by nbconvert. However, nbconvert 6.0 + provides limited support for Python 3.6. nbconvert 6.1 will drop + support for Python 3.6. Limited support means we will test and + run CI on Python 3.6.12 or higher. Issues that are found only + affecting Python 3.6 are not guaranteed to be fixed. We + recommend all users of nbconvert use Python 3.7 and higher. + - Unlike previous versions, nbconvert 6.0 relies on the nbclient + package for the execute preprocessor, which allows for + asynchronous kernel requests. + - template_path has become template_paths. If referring to a 5.x + style .tpl template use the full path with the template_file + argument to the file. On the command line the pattern is + --template-file=. + - Nbconvert 6.0 includes a new "webpdf" exporter, which renders + notebooks in pdf format through a headless web browser, so that + complex outputs such as HTML tables, or even widgets are + rendered in the same way as with the HTML exporter and a web + browser. + - The default template applied when exporting to HTML now produces + the same DOM structure as JupyterLab, and is styled using + JupyterLab's CSS. The pygments theme in use mimics JupyterLab's + codemirror mode with the same CSS variables, so that custom + JupyterLab themes could be applied. The classic notebook styling + can still be enabled with + - jupyter nbconvert --to html --template classic + - Nbconvert 6.0 includes a new system for creating custom + templates, which can now be installed as packages. A custom + "foobar" template is installed in Jupyter's data directory under + nbconvert/templates and has the form of a directory containing + all resources. Templates specify their base template as well as + other configuration parameters in a conf.json at the root of the + template directory. + - The "slideshow" template now makes use of RevealJS version 4. It + can now be used with the HTML exporter with + - jupyter nbconvert --to html --template reveal + - The --to slides exporter is still supported for convenience. + - Inkscape 1.0 is now supported, which had some breaking changes + that prevented 5.x versions of nbconvert from converting + documents on some systems that updated. +- Add skip_network_tests.patch to skip tests requiring network + access (gh#jupyter/nbconvert#1526). + ------------------------------------------------------------------- Tue Mar 10 08:18:59 UTC 2020 - Tomáš Chvátal diff --git a/python-nbconvert.spec b/python-nbconvert.spec index 52a883d..85721b4 100644 --- a/python-nbconvert.spec +++ b/python-nbconvert.spec @@ -1,7 +1,7 @@ # # spec file for package python-nbconvert # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,9 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define doc_ver 5.6.1 +%define doc_ver 6.0.7 Name: python-nbconvert -Version: 5.6.1 +Version: 6.0.7 Release: 0 Summary: Conversion of Jupyter Notebooks License: BSD-3-Clause @@ -27,6 +27,9 @@ 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 +# PATCH-FIX-UPSTREAM skip_network_tests.patch gh#jupyter/nbconvert#1526 mcepl@suse.com +# Skip tests requiring network access +Patch0: skip_network_tests.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -61,11 +64,13 @@ 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 mistune >= 0.7.4} BuildRequires: %{python_module mock} +BuildRequires: %{python_module nbclient} BuildRequires: %{python_module nbformat >= 4.4} -BuildRequires: %{python_module nose} BuildRequires: %{python_module pandocfilters >= 1.4.1} +BuildRequires: %{python_module pyppeteer} BuildRequires: %{python_module pytest} BuildRequires: %{python_module testpath} BuildRequires: %{python_module tornado >= 4.0} @@ -122,7 +127,8 @@ Obsoletes: %{python_module jupyter_nbconvert-doc < %{version}} Documentation and help files for Jupyter's notebook converter. %prep -%setup -q -n nbconvert-%{version} +%autosetup -p1 -n nbconvert-%{version} + cp %{SOURCE1} . unzip %{SOURCE2} -d docs mv docs/nbconvert-* docs/html @@ -148,13 +154,10 @@ cp -r docs/html %{buildroot}%{_docdir}/jupyter-nbconvert/ pushd docs export LANG=en_US.UTF-8 export PYTHONDONTWRITEBYTECODE=1 -# test_run_notebooks disabled until IPython 7 incompatibility in tests fixed. -# test_run_all_notebooks disabled temporarily as it fails with py3.8 -# See https://github.com/jupyter/nbconvert/issues/898 -# parallel notebooks don't work reliably on python 2.x +export JUPYTER_PATH=%{buildroot}%{_datadir}/jupyter %{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib} $python -B -m ipykernel.kernelspec --user -pytest-%{$python_bin_suffix} -v --pyargs -k 'not (test_run_all_notebooks or test_svg_handling or test_run_notebooks or test_parallel_notebooks or test_many_parallel_notebooks)' nbconvert +pytest-%{$python_bin_suffix} -v -k 'not network' --pyargs nbconvert } popd @@ -167,6 +170,8 @@ popd %files -n jupyter-nbconvert %license LICENSE %{_bindir}/jupyter-nbconvert +%dir %{_datadir}/jupyter/nbconvert +%{_datadir}/jupyter/nbconvert/templates %files -n jupyter-nbconvert-latex %license LICENSE diff --git a/skip_network_tests.patch b/skip_network_tests.patch new file mode 100644 index 0000000..6b8019b --- /dev/null +++ b/skip_network_tests.patch @@ -0,0 +1,47 @@ +--- + nbconvert/exporters/tests/test_webpdf.py | 1 + + nbconvert/tests/test_nbconvertapp.py | 5 +++-- + setup.cfg | 4 ++++ + 3 files changed, 8 insertions(+), 2 deletions(-) + +--- a/nbconvert/exporters/tests/test_webpdf.py ++++ b/nbconvert/exporters/tests/test_webpdf.py +@@ -16,6 +16,7 @@ class TestWebPDFExporter(ExportersTestsB + + exporter_class = WebPDFExporter + ++ @pytest.mark.network + def test_export(self): + """ + Can a TemplateExporter export something? +--- a/nbconvert/tests/test_nbconvertapp.py ++++ b/nbconvert/tests/test_nbconvertapp.py +@@ -146,6 +146,7 @@ class TestNbConvertApp(TestsBase): + ) + assert os.path.isfile('notebook with spaces.pdf') + ++ @pytest.mark.network + def test_webpdf_with_chromium(self): + """ + Generate PDFs if chromium allowed to be downloaded? +@@ -356,8 +357,8 @@ class TestNbConvertApp(TestsBase): + text = f.read() + assert 'celltag_mycelltag celltag_mysecondcelltag' in text + assert 'celltag_mymarkdowncelltag' in text +- +- ++ ++ + def test_no_input(self): + """ + Verify that the html has no input when given --no-input. +--- a/setup.cfg ++++ b/setup.cfg +@@ -8,3 +8,7 @@ license_file = LICENSE + ignore = + nbconvert/resources/style.min.css + .circleci/* ++ ++[tool:pytest] ++markers = ++ network: marks tests which require network connection