From 5956bddfdbf55323409ae1b61a40b1c50cf89a8e46d145203c02627c4f42cfa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= <mmachova@suse.com>
Date: Thu, 12 Aug 2021 08:00:32 +0000
Subject: [PATCH] Accepting request 911461 from
 home:bnavigator:branches:devel:languages:python:jupyter

- Disable testing the kernelmanager in the python36 flavor in
  lettered staging so that we don't need python-ipykernel5 in Ring1
- Work around conflict for jupyter-ipykernel due to dangling
  python36-ipykernel package until it gets removed from Factory

OBS-URL: https://build.opensuse.org/request/show/911461
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-jupyter-client?expand=0&rev=11
---
 python-jupyter-client.changes |  8 ++++++++
 python-jupyter-client.spec    | 21 +++++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/python-jupyter-client.changes b/python-jupyter-client.changes
index a311c48..48c28e5 100644
--- a/python-jupyter-client.changes
+++ b/python-jupyter-client.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Aug 11 09:38:35 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Disable testing the kernelmanager in the python36 flavor in
+  lettered staging so that we don't need python-ipykernel5 in Ring1
+- Work around conflict for jupyter-ipykernel due to dangling
+  python36-ipykernel package until it gets removed from Factory
+
 -------------------------------------------------------------------
 Mon Jun 28 10:11:19 UTC 2021 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-jupyter-client.spec b/python-jupyter-client.spec
index 6c16769..caecc2c 100644
--- a/python-jupyter-client.spec
+++ b/python-jupyter-client.spec
@@ -24,6 +24,13 @@
 %define psuffix %{nil}
 %bcond_with test
 %endif
+%bcond_with ringdisabled
+%if %{with ringdisabled}
+# don't test kernelmanager in lettered staging so that we don't need python36-ipykernel5 in Ring1
+%bcond_with test_py36_ipykernel
+%else
+%bcond_without test_py36_ipykernel
+%endif
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-jupyter-client%{psuffix}
 Version:        6.1.12
@@ -49,7 +56,6 @@ Obsoletes:      python-jupyter_client < %{version}
 BuildArch:      noarch
 %if %{with test}
 BuildRequires:  %{python_module Sphinx}
-BuildRequires:  %{python_module ipykernel}
 BuildRequires:  %{python_module ipython}
 BuildRequires:  %{python_module jupyter-client = %{version}}
 BuildRequires:  %{python_module pytest-asyncio}
@@ -58,6 +64,14 @@ BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module traitlets}
 # flaky is not an upstream dep, but for obs flakyness of parallel kernel test
 BuildRequires:  %{python_module flaky}
+%if %{with test_py36_ipykernel}
+BuildRequires:  %{python_module ipykernel}
+# Workaround until python-ipykernel 6 lands in Factory and openSUSE:Tumbleweed/dod, removing python36-ipykernel
+# (see https://lists.opensuse.org/archives/list/packaging@lists.opensuse.org/message/742CEMJ57YWNVESAPWJ6HHZBZZ4RMJFP )
+#!BuildIgnore:  python36-ipykernel:jupyter-ipykernel
+%else
+BuildRequires:  %{python_module ipykernel if (%python-base without python36-base)}
+%endif
 %endif
 %python_subpackages
 
@@ -107,7 +121,10 @@ sed -i -E 's/(^\s+)break/\1time.sleep(1)\n\1break/' \
 %if %{with test}
 %check
 pushd jupyter_client/tests
-%pytest --force-flaky --max-runs=2 --no-success-flaky-report
+%if ! %{with test_py36_ipykernel}
+python36_donttest=("-k" "not test_kernelmanager")
+%endif
+%pytest --force-flaky --max-runs=3 --no-success-flaky-report "${$python_donttest[@]}"
 popd
 %endif