From b122a593de2405a65c35f8f4dca87f3d8b225643cecf8d20e4f38e433712bb97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= <mmachova@suse.com>
Date: Thu, 1 Apr 2021 10:20:51 +0000
Subject: [PATCH] Accepting request 882414 from
 home:bnavigator:branches:devel:languages:python:jupyter

- Test in multibuild in order to break build dependency cycle with
  nbclient

OBS-URL: https://build.opensuse.org/request/show/882414
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbconvert?expand=0&rev=24
---
 _multibuild              |  3 +++
 python-nbconvert.changes |  6 ++++++
 python-nbconvert.spec    | 30 +++++++++++++++++++++---------
 3 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 _multibuild

diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..ec2fdbb
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,3 @@
+<multibuild>
+  <package>test</package>
+</multibuild>
\ No newline at end of file
diff --git a/python-nbconvert.changes b/python-nbconvert.changes
index ee9cad7..5dbbc0b 100644
--- a/python-nbconvert.changes
+++ b/python-nbconvert.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 31 14:30:47 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Test in multibuild in order to break build dependency cycle with
+  nbclient
+
 -------------------------------------------------------------------
 Sun Feb 28 22:22:52 UTC 2021 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-nbconvert.spec b/python-nbconvert.spec
index 6f2a8ef..b391f70 100644
--- a/python-nbconvert.spec
+++ b/python-nbconvert.spec
@@ -16,6 +16,15 @@
 #
 
 
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
+
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define doc_ver 6.0.7
 Name:           python-nbconvert
@@ -55,7 +64,7 @@ Suggests:       %{name}-latex
 Provides:       python-jupyter_nbconvert = %{version}
 Obsoletes:      python-jupyter_nbconvert < %{version}
 BuildArch:      noarch
-# SECTION test requirements
+%if %{with test}
 BuildRequires:  %{python_module Jinja2}
 BuildRequires:  %{python_module Pebble}
 BuildRequires:  %{python_module Pygments}
@@ -70,6 +79,7 @@ BuildRequires:  %{python_module jupyterlab-pygments}
 BuildRequires:  %{python_module mistune >= 0.7.4}
 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 pyppeteer}
@@ -77,7 +87,7 @@ BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module testpath}
 BuildRequires:  %{python_module tornado >= 4.0}
 BuildRequires:  %{python_module traitlets >= 4.2}
-# /SECTION
+%endif
 %python_subpackages
 
 %description
@@ -138,13 +148,14 @@ rm docs/html/.buildinfo
 sed -i -e '/^#!\//, 1d' nbconvert/nbconvertapp.py
 sed -i -e '/^#!\//, 1d' nbconvert/filters/filter_links.py
 
-# Ignore stupid maxversion requirements
+# Ignore maxversion requirements
 sed -i -e "/nbclient/ s/,<.*'/'/" setup.py
 
 %build
 %python_build
 
 %install
+%if ! %{with test}
 %python_install
 
 mkdir -p %{buildroot}%{_docdir}/jupyter-nbconvert
@@ -154,21 +165,20 @@ cp -r docs/html %{buildroot}%{_docdir}/jupyter-nbconvert/
 
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 %fdupes %{buildroot}%{_docdir}/jupyter-nbconvert/
+%endif
 
+%if %{with test}
 %check
 pushd docs
 export LANG=en_US.UTF-8
-export PYTHONDONTWRITEBYTECODE=1
-export JUPYTER_PATH=%{buildroot}%{_datadir}/jupyter
-%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib}
+%{python_expand # installed package in :test flavor
 $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
+%endif
 
+%if ! %{with test}
 %files %{python_files}
 %license LICENSE
 %doc README.md
@@ -178,6 +188,7 @@ rmdir %{buildroot}%{_datadir}/jupyter/nbconvert/templates/html
 %files -n jupyter-nbconvert
 %license LICENSE
 %{_bindir}/jupyter-nbconvert
+%dir %{_datadir}/jupyter/
 %dir %{_datadir}/jupyter/nbconvert
 %{_datadir}/jupyter/nbconvert/templates
 
@@ -189,5 +200,6 @@ rmdir %{buildroot}%{_datadir}/jupyter/nbconvert/templates/html
 %dir %{_docdir}/jupyter-nbconvert/
 %{_docdir}/jupyter-nbconvert/nbconvert.pdf
 %{_docdir}/jupyter-nbconvert/html
+%endif
 
 %changelog