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
This commit is contained in:
Markéta Machová 2021-08-12 08:00:32 +00:00 committed by Git OBS Bridge
parent 5a55a95806
commit 5956bddfdb
2 changed files with 27 additions and 2 deletions

View File

@ -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>

View File

@ -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