From 70da96f3e653ae3c1ab8d57d6bcc57489fff43f8d6a179fe4f23fda689606e59 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 26 Feb 2021 16:35:40 +0000 Subject: [PATCH 1/3] Fix setup.py dependencies OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbconvert?expand=0&rev=19 --- python-nbconvert.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/python-nbconvert.spec b/python-nbconvert.spec index 85721b4..3f23642 100644 --- a/python-nbconvert.spec +++ b/python-nbconvert.spec @@ -136,6 +136,9 @@ rm docs/html/.buildinfo sed -i -e '/^#!\//, 1d' nbconvert/nbconvertapp.py sed -i -e '/^#!\//, 1d' nbconvert/filters/filter_links.py +# Ignore stupd version requirements +sed -i -e "/nbclient/s/>.*'/'/" setup.py + %build %python_build From 1a45fb63f4771aadce7ade10bc7dad511254cce943f77d181dd1c65b85dd5671 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 26 Feb 2021 21:44:08 +0000 Subject: [PATCH 2/3] Add missing Requires OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbconvert?expand=0&rev=21 --- python-nbconvert.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-nbconvert.spec b/python-nbconvert.spec index 3f23642..91b8ab8 100644 --- a/python-nbconvert.spec +++ b/python-nbconvert.spec @@ -42,6 +42,7 @@ 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-mistune >= 0.7.4 Requires: python-nbformat >= 4.4 Requires: python-pandocfilters >= 1.4.1 From 2a8810e02673d651e7291469fb4a75c0a5d6b4c490ac56b8d6e787a3db3c5e6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Mon, 1 Mar 2021 09:44:52 +0000 Subject: [PATCH 3/3] Accepting request 875837 from home:bnavigator:branches:devel:languages:python:jupyter - Add missing runtime requirement of nbclient. Keep the minversion - Remove empty html templates dir after test runs. This directory installed with mode 700 caused other package test suites to fail. OBS-URL: https://build.opensuse.org/request/show/875837 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbconvert?expand=0&rev=22 --- python-nbconvert.changes | 7 +++++++ python-nbconvert.spec | 10 +++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/python-nbconvert.changes b/python-nbconvert.changes index d4b3127..ee9cad7 100644 --- a/python-nbconvert.changes +++ b/python-nbconvert.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Feb 28 22:22:52 UTC 2021 - Ben Greiner + +- Add missing runtime requirement of nbclient. Keep the minversion +- Remove empty html templates dir after test runs. This directory + installed with mode 700 caused other package test suites to fail. + ------------------------------------------------------------------- Thu Feb 25 21:11:07 UTC 2021 - Matej Cepl diff --git a/python-nbconvert.spec b/python-nbconvert.spec index 91b8ab8..6f2a8ef 100644 --- a/python-nbconvert.spec +++ b/python-nbconvert.spec @@ -44,6 +44,7 @@ Requires: python-jupyter-client >= 5.3.1 Requires: python-jupyter-core Requires: python-jupyterlab-pygments Requires: python-mistune >= 0.7.4 +Requires: python-nbclient >= 0.5 Requires: python-nbformat >= 4.4 Requires: python-pandocfilters >= 1.4.1 Requires: python-testpath @@ -68,7 +69,7 @@ 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 nbclient >= 0.5} BuildRequires: %{python_module nbformat >= 4.4} BuildRequires: %{python_module pandocfilters >= 1.4.1} BuildRequires: %{python_module pyppeteer} @@ -137,8 +138,8 @@ rm docs/html/.buildinfo sed -i -e '/^#!\//, 1d' nbconvert/nbconvertapp.py sed -i -e '/^#!\//, 1d' nbconvert/filters/filter_links.py -# Ignore stupd version requirements -sed -i -e "/nbclient/s/>.*'/'/" setup.py +# Ignore stupid maxversion requirements +sed -i -e "/nbclient/ s/,<.*'/'/" setup.py %build %python_build @@ -164,6 +165,9 @@ $python -B -m ipykernel.kernelspec --user pytest-%{$python_bin_suffix} -v -k 'not network' --pyargs nbconvert } popd +# naughty test suite: this empty directory in the now deprecated template folder +# is created with mode 700 during the tests and causes other packages to fail +rmdir %{buildroot}%{_datadir}/jupyter/nbconvert/templates/html %files %{python_files} %license LICENSE