From abef0c22b43035d3f9ca9fa542bc8c4c7abe57705998fd87ed868d7f4c0b670f 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 11:46:37 +0000
Subject: [PATCH] Accepting request 911567 from
 home:bnavigator:branches:devel:languages:python:jupyter

- remove the ringdisabled conditional: ipykernel5 will be in Ring1

OBS-URL: https://build.opensuse.org/request/show/911567
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-jupyter-client?expand=0&rev=12
---
 python-jupyter-client.changes |  5 +++++
 python-jupyter-client.spec    | 18 ++----------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/python-jupyter-client.changes b/python-jupyter-client.changes
index 48c28e5..91d5a00 100644
--- a/python-jupyter-client.changes
+++ b/python-jupyter-client.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 12 10:13:22 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- remove the ringdisabled conditional: ipykernel5 will be in Ring1
+
 -------------------------------------------------------------------
 Wed Aug 11 09:38:35 UTC 2021 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-jupyter-client.spec b/python-jupyter-client.spec
index caecc2c..18d323d 100644
--- a/python-jupyter-client.spec
+++ b/python-jupyter-client.spec
@@ -24,13 +24,6 @@
 %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
@@ -56,6 +49,7 @@ 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}
@@ -64,14 +58,9 @@ 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
 
@@ -121,10 +110,7 @@ sed -i -E 's/(^\s+)break/\1time.sleep(1)\n\1break/' \
 %if %{with test}
 %check
 pushd jupyter_client/tests
-%if ! %{with test_py36_ipykernel}
-python36_donttest=("-k" "not test_kernelmanager")
-%endif
-%pytest --force-flaky --max-runs=3 --no-success-flaky-report "${$python_donttest[@]}"
+%pytest --force-flaky --max-runs=3 --no-success-flaky-report
 popd
 %endif