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
This commit is contained in:
parent
5956bddfdb
commit
abef0c22b4
@ -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>
|
Wed Aug 11 09:38:35 UTC 2021 - Ben Greiner <code@bnavigator.de>
|
||||||
|
|
||||||
|
@ -24,13 +24,6 @@
|
|||||||
%define psuffix %{nil}
|
%define psuffix %{nil}
|
||||||
%bcond_with test
|
%bcond_with test
|
||||||
%endif
|
%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-%{**}}
|
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
|
||||||
Name: python-jupyter-client%{psuffix}
|
Name: python-jupyter-client%{psuffix}
|
||||||
Version: 6.1.12
|
Version: 6.1.12
|
||||||
@ -56,6 +49,7 @@ Obsoletes: python-jupyter_client < %{version}
|
|||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%if %{with test}
|
%if %{with test}
|
||||||
BuildRequires: %{python_module Sphinx}
|
BuildRequires: %{python_module Sphinx}
|
||||||
|
BuildRequires: %{python_module ipykernel}
|
||||||
BuildRequires: %{python_module ipython}
|
BuildRequires: %{python_module ipython}
|
||||||
BuildRequires: %{python_module jupyter-client = %{version}}
|
BuildRequires: %{python_module jupyter-client = %{version}}
|
||||||
BuildRequires: %{python_module pytest-asyncio}
|
BuildRequires: %{python_module pytest-asyncio}
|
||||||
@ -64,14 +58,9 @@ BuildRequires: %{python_module pytest}
|
|||||||
BuildRequires: %{python_module traitlets}
|
BuildRequires: %{python_module traitlets}
|
||||||
# flaky is not an upstream dep, but for obs flakyness of parallel kernel test
|
# flaky is not an upstream dep, but for obs flakyness of parallel kernel test
|
||||||
BuildRequires: %{python_module flaky}
|
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
|
# 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 )
|
# (see https://lists.opensuse.org/archives/list/packaging@lists.opensuse.org/message/742CEMJ57YWNVESAPWJ6HHZBZZ4RMJFP )
|
||||||
#!BuildIgnore: python36-ipykernel:jupyter-ipykernel
|
#!BuildIgnore: python36-ipykernel:jupyter-ipykernel
|
||||||
%else
|
|
||||||
BuildRequires: %{python_module ipykernel if (%python-base without python36-base)}
|
|
||||||
%endif
|
|
||||||
%endif
|
%endif
|
||||||
%python_subpackages
|
%python_subpackages
|
||||||
|
|
||||||
@ -121,10 +110,7 @@ sed -i -E 's/(^\s+)break/\1time.sleep(1)\n\1break/' \
|
|||||||
%if %{with test}
|
%if %{with test}
|
||||||
%check
|
%check
|
||||||
pushd jupyter_client/tests
|
pushd jupyter_client/tests
|
||||||
%if ! %{with test_py36_ipykernel}
|
%pytest --force-flaky --max-runs=3 --no-success-flaky-report
|
||||||
python36_donttest=("-k" "not test_kernelmanager")
|
|
||||||
%endif
|
|
||||||
%pytest --force-flaky --max-runs=3 --no-success-flaky-report "${$python_donttest[@]}"
|
|
||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user