From 40cce72467872f02e6081ecbf20c56b58528b41a9bc1cf6dee58cb0706436b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Tue, 22 Nov 2022 12:29:28 +0000 Subject: [PATCH] Accepting request 1037173 from home:bnavigator:branches:devel:languages:python:numeric - Remove allow-bokeh3.patch * gh#dask/distributed#7329, gh#dask/dask#9659 * we provide a legacy bokeh2 instead OBS-URL: https://build.opensuse.org/request/show/1037173 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-distributed?expand=0&rev=126 --- allow-bokeh3.patch | 13 ------------- python-distributed.changes | 7 +++++++ python-distributed.spec | 5 ++--- 3 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 allow-bokeh3.patch diff --git a/allow-bokeh3.patch b/allow-bokeh3.patch deleted file mode 100644 index 9795657..0000000 --- a/allow-bokeh3.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: distributed-2022.11.1/distributed/versions.py -=================================================================== ---- distributed-2022.11.1.orig/distributed/versions.py -+++ distributed-2022.11.1/distributed/versions.py -@@ -13,7 +13,7 @@ from types import ModuleType - from typing import Any - - MIN_BOKEH_VERSION = "2.4.2" --MAX_BOKEH_VERSION = "2.4.3" -+MAX_BOKEH_VERSION = "4" - - required_packages = [ - ("dask", lambda p: p.__version__), diff --git a/python-distributed.changes b/python-distributed.changes index 5131070..f53d745 100644 --- a/python-distributed.changes +++ b/python-distributed.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 21 19:00:10 UTC 2022 - Ben Greiner + +- Remove allow-bokeh3.patch + * gh#dask/distributed#7329, gh#dask/dask#9659 + * we provide a legacy bokeh2 instead + ------------------------------------------------------------------- Sun Nov 20 10:38:22 UTC 2022 - Ben Greiner diff --git a/python-distributed.spec b/python-distributed.spec index c863512..b770607 100644 --- a/python-distributed.spec +++ b/python-distributed.spec @@ -51,8 +51,6 @@ License: BSD-3-Clause URL: https://distributed.dask.org Source: https://github.com/dask/distributed/archive/refs/tags/%{version}.tar.gz#/distributed-%{version}-gh.tar.gz Source99: python-distributed-rpmlintrc -# PATCH-FIX-UPSTREAM allow-bokeh3.patch -- raise upper bokeh version, reverts part of gh#dask/distributed#7329, see also gh#dask/dask#9659 -Patch1: allow-bokeh3.patch # PATCH-FIX-UPSTREAM distributed-pr7286-tornado-6-2.patch gh#dask/distributed#7286 Patch2: distributed-pr7286-tornado-6-2.patch # PATCH-FIX-OPENSUSE distributed-ignore-off.patch -- ignore that we can't probe addresses on obs, code@bnavigator.de @@ -82,7 +80,8 @@ Requires(post): update-alternatives Requires(postun):update-alternatives BuildArch: noarch %if %{with test} -BuildRequires: %{python_module bokeh >= 2.4.2} +# bokeh 3: see gh#dask/distributed#7329, gh#dask/dask#9659, we provide a legacy bokeh2 in Tumbleweed +BuildRequires: %{python_module bokeh >= 2.4.2 with %python-bokeh < 2.4.4} BuildRequires: %{python_module dask-complete = %{version}} BuildRequires: %{python_module distributed = %{version}} BuildRequires: %{python_module ipykernel}