From 70b4ca991db06661eae186372fdf0eca89f2376d597ff009d307bcf64dcd86ae Mon Sep 17 00:00:00 2001
From: Benjamin Greiner <code@bnavigator.de>
Date: Mon, 3 Jul 2023 18:26:50 +0000
Subject: [PATCH] Accepting request 1096637 from
 home:bnavigator:branches:devel:languages:python:jupyter

- Fix test suite hangs
- Don't assume only Tumbleweed can have more than one flavor

OBS-URL: https://build.opensuse.org/request/show/1096637
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-ipykernel?expand=0&rev=83
---
 python-ipykernel.changes | 6 ++++++
 python-ipykernel.spec    | 9 +++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/python-ipykernel.changes b/python-ipykernel.changes
index 4db31fe..a76426f 100644
--- a/python-ipykernel.changes
+++ b/python-ipykernel.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Jul  2 06:34:01 UTC 2023 - Ben Greiner <code@bnavigator.de>
+
+- Fix test suite hangs
+- Don't assume only Tumbleweed can have more than one flavor
+
 -------------------------------------------------------------------
 Sat Jul  1 16:27:15 UTC 2023 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-ipykernel.spec b/python-ipykernel.spec
index 875f064..ccadc85 100644
--- a/python-ipykernel.spec
+++ b/python-ipykernel.spec
@@ -16,6 +16,7 @@
 #
 
 
+%{?sle15_python_module_pythons}
 Name:           python-ipykernel
 Version:        6.23.3
 Release:        0
@@ -96,7 +97,6 @@ sed -i -e 's/--color=yes//' pyproject.toml
 %install
 %pyproject_install
 
-%if 0%{?suse_version} >= 1550
 # use the symlink for the default python3 flavor, which was installed during the install but used python3.X name
 # from the primary flavor.
 sed -i "s|$(readlink -f python3)|python3|" %{buildroot}%{_jupyter_kernel_dir}/python3/kernel.json
@@ -107,15 +107,14 @@ $python -m ipykernel install \
     --name python%{$python_bin_suffix} \
     --display-name 'Python %{$python_bin_suffix} (ipykernel)'
 }
-%endif
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 %fdupes  %{buildroot}%{_jupyter_kernel_dir}
 
 %check
-# flaky: bad timings in obs often cause this to fail
-donttest="test_shutdown_subprocesses"
 # fails in obs setups
 ignoretests="--ignore ipykernel/tests/test_debugger.py"
+# flaky obs timeouts
+donttest="test_init_ipc_socket"
 # we don't want ipyparallel and its dependencies in Ring1
 ignoretests="$ignoretests --ignore ipykernel/tests/test_pickleutil.py"
 donttest="$donttest or test_do_apply"
@@ -128,9 +127,7 @@ donttest="$donttest or test_do_apply"
 %{python_sitelib}/ipykernel_launcher.py
 %{python_sitelib}/ipykernel-%{version}*-info
 %pycache_only %{python_sitelib}/__pycache__/ipykernel_launcher*.pyc
-%if 0%{?suse_version} >= 1550
 %{_jupyter_kernel_dir}/python%{python_bin_suffix}
-%endif
 %if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3"
 %{_jupyter_kernel_dir}/python3
 %endif