From e75949f3f5ae3e0e3f9a1bcded5321bc182b98d2b2bed74a3a895da96f46d42a Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 20 Nov 2022 18:39:06 +0000 Subject: [PATCH 1/3] Accepting request 1036960 from home:bnavigator:branches:devel:languages:python - Update to version 3.0.2 ## bugfixes * #4930 interaction between tooltips and gridplots * #12429 [component: bokehjs] [BUG] Line selection does not render the unselected end line segments * #12531 [component: bokehjs] [BUG] latex in titles - upright characters that should be italic * #12551 [component: tests] bokehjs' unit tests fail on chromium 107 * #12554 [component: docs] Custom.js needs update for switcher * #12578 [component: bokehjs] [BUG] gridplot reset button does not reset all figures * #12585 [component: bokehjs] [BUG] line_policy='none' for HoverTool does not generate any tooltip * #12587 [component: server] [BUG] Don't delete importlib.metadata in __init__.py * #12593 [BUG] Guard numpy.typing.ArrayType with `if TYPE_CHECKING` ## tasks * #12557 [component: docs] Need automation for updating switcher.json * #12560 [FEATURE] remove mock * #12562 [BUG] Tests: "python" is not a guaranteed executable * #12566 [component: docs] Fix dates and typo in release docs for 3.0.0/3.0.1 * #12569 [component: build] Add Python 3.11 to CI * #12571 [component: tests] Remove flaky from integration tests * #12573 [component: tests] Add a regression test for issue #4888 * #12579 Upgrade to mypy 0.990 * #12581 Disable Selenium integration tests for now * #12597 Backports for 3.0.2 * #12600 Updates for 3.0.2 OBS-URL: https://build.opensuse.org/request/show/1036960 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-bokeh?expand=0&rev=63 --- bokeh-3.0.1-gh.tar.gz | 3 - bokeh-3.0.1.tar.gz | 3 - bokeh-3.0.2-gh.tar.gz | 3 + bokeh-3.0.2.tar.gz | 3 + bokeh-remove-mock.patch | 497 ------------------------------------- bokeh-sys-executable.patch | 26 -- python-bokeh.changes | 36 +++ python-bokeh.spec | 9 +- 8 files changed, 44 insertions(+), 536 deletions(-) delete mode 100644 bokeh-3.0.1-gh.tar.gz delete mode 100644 bokeh-3.0.1.tar.gz create mode 100644 bokeh-3.0.2-gh.tar.gz create mode 100644 bokeh-3.0.2.tar.gz delete mode 100644 bokeh-remove-mock.patch delete mode 100644 bokeh-sys-executable.patch diff --git a/bokeh-3.0.1-gh.tar.gz b/bokeh-3.0.1-gh.tar.gz deleted file mode 100644 index a8e4da0..0000000 --- a/bokeh-3.0.1-gh.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd32fd760906b18becc6a1b320175a9b8d6c24acf94d91393004037a159265fc -size 37179517 diff --git a/bokeh-3.0.1.tar.gz b/bokeh-3.0.1.tar.gz deleted file mode 100644 index 881434b..0000000 --- a/bokeh-3.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa044829f66f08e9aeb74e33d538bc719270406124ea128bd7616e09e1561815 -size 15511827 diff --git a/bokeh-3.0.2-gh.tar.gz b/bokeh-3.0.2-gh.tar.gz new file mode 100644 index 0000000..05ebae7 --- /dev/null +++ b/bokeh-3.0.2-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:beb6c008ff72b41e859764419aad022b0e46cc72ef2884a43405be6417e93b10 +size 37587673 diff --git a/bokeh-3.0.2.tar.gz b/bokeh-3.0.2.tar.gz new file mode 100644 index 0000000..036f3f5 --- /dev/null +++ b/bokeh-3.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb537cf24f5a25a6739393f9906ddf8c913bfebc4cb120d342e8262889326f7d +size 15517618 diff --git a/bokeh-remove-mock.patch b/bokeh-remove-mock.patch deleted file mode 100644 index bf9f135..0000000 --- a/bokeh-remove-mock.patch +++ /dev/null @@ -1,497 +0,0 @@ -diff --git a/tests/unit/bokeh/application/test_application.py b/tests/unit/bokeh/application/test_application.py -index 7fa815eff..c1de92ff6 100644 ---- a/tests/unit/bokeh/application/test_application.py -+++ b/tests/unit/bokeh/application/test_application.py -@@ -20,7 +20,7 @@ import pytest ; pytest - import logging - - # External imports --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Bokeh imports - from bokeh.application.handlers import CodeHandler, FunctionHandler, Handler -diff --git a/tests/unit/bokeh/client/test_session__client.py b/tests/unit/bokeh/client/test_session__client.py -index 2157d0bea..c1f2bf261 100644 ---- a/tests/unit/bokeh/client/test_session__client.py -+++ b/tests/unit/bokeh/client/test_session__client.py -@@ -17,7 +17,7 @@ import pytest ; pytest - #----------------------------------------------------------------------------- - - # External imports --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Module under test - import bokeh.client.session as bcs # isort:skip -diff --git a/tests/unit/bokeh/command/test_subcommand.py b/tests/unit/bokeh/command/test_subcommand.py -index 507d14541..a6442566c 100644 ---- a/tests/unit/bokeh/command/test_subcommand.py -+++ b/tests/unit/bokeh/command/test_subcommand.py -@@ -17,7 +17,7 @@ import pytest ; pytest - #----------------------------------------------------------------------------- - - # External imports --from mock import MagicMock -+from unittest.mock import MagicMock - - # Module under test - import bokeh.command.subcommand as sc # isort:skip -diff --git a/tests/unit/bokeh/command/test_util__command.py b/tests/unit/bokeh/command/test_util__command.py -index ec6c72991..baa8365a3 100644 ---- a/tests/unit/bokeh/command/test_util__command.py -+++ b/tests/unit/bokeh/command/test_util__command.py -@@ -21,7 +21,7 @@ import os - import tempfile - - # External imports --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Bokeh imports - from tests.support.util.types import Capture -diff --git a/tests/unit/bokeh/core/property/test_bases.py b/tests/unit/bokeh/core/property/test_bases.py -index 2e65191a1..cc69110f6 100644 ---- a/tests/unit/bokeh/core/property/test_bases.py -+++ b/tests/unit/bokeh/core/property/test_bases.py -@@ -22,7 +22,7 @@ from typing import Any - # External imports - import numpy as np - import pandas as pd --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Bokeh imports - from bokeh.core.has_props import HasProps -diff --git a/tests/unit/bokeh/core/property/test_descriptors.py b/tests/unit/bokeh/core/property/test_descriptors.py -index 2b4676064..00c279b03 100644 ---- a/tests/unit/bokeh/core/property/test_descriptors.py -+++ b/tests/unit/bokeh/core/property/test_descriptors.py -@@ -20,7 +20,7 @@ import pytest ; pytest - import typing as tp - - # External imports --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Bokeh imports - from bokeh.core.properties import Int, List, Nullable -diff --git a/tests/unit/bokeh/core/property/test_wrappers__property.py b/tests/unit/bokeh/core/property/test_wrappers__property.py -index 2202244cc..4551be8cc 100644 ---- a/tests/unit/bokeh/core/property/test_wrappers__property.py -+++ b/tests/unit/bokeh/core/property/test_wrappers__property.py -@@ -17,7 +17,7 @@ import pytest ; pytest - #----------------------------------------------------------------------------- - - # External imports --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Bokeh imports - from bokeh.core.properties import ( -diff --git a/tests/unit/bokeh/core/test_validation.py b/tests/unit/bokeh/core/test_validation.py -index 8f2634161..02971b25b 100644 ---- a/tests/unit/bokeh/core/test_validation.py -+++ b/tests/unit/bokeh/core/test_validation.py -@@ -20,7 +20,7 @@ import pytest ; pytest - from typing import Any, cast - - # External imports --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Bokeh imports - from bokeh.core.properties import Int -diff --git a/tests/unit/bokeh/document/test_callbacks__document.py b/tests/unit/bokeh/document/test_callbacks__document.py -index a42798c9d..2790d470c 100644 ---- a/tests/unit/bokeh/document/test_callbacks__document.py -+++ b/tests/unit/bokeh/document/test_callbacks__document.py -@@ -22,7 +22,7 @@ import logging - from typing import Any - - # External imports --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Bokeh imports - from bokeh.core.enums import HoldPolicy, HoldPolicyType -diff --git a/tests/unit/bokeh/document/test_document.py b/tests/unit/bokeh/document/test_document.py -index 63072acc7..0cf36ebe9 100644 ---- a/tests/unit/bokeh/document/test_document.py -+++ b/tests/unit/bokeh/document/test_document.py -@@ -21,7 +21,7 @@ import weakref - from typing import Any - - # External imports --from mock import patch -+from unittest.mock import patch - - # Bokeh imports - from bokeh.core.enums import HoldPolicy -diff --git a/tests/unit/bokeh/document/test_events__document.py b/tests/unit/bokeh/document/test_events__document.py -index 346a4290b..6ad971126 100644 ---- a/tests/unit/bokeh/document/test_events__document.py -+++ b/tests/unit/bokeh/document/test_events__document.py -@@ -18,7 +18,7 @@ import pytest ; pytest - - # External imports - import pandas as pd --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Bokeh imports - from bokeh.core.properties import Any, ColumnData, Instance -diff --git a/tests/unit/bokeh/document/test_models.py b/tests/unit/bokeh/document/test_models.py -index 8f21cc135..da87c39b5 100644 ---- a/tests/unit/bokeh/document/test_models.py -+++ b/tests/unit/bokeh/document/test_models.py -@@ -20,7 +20,7 @@ import pytest ; pytest - import gc - - # External imports --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Bokeh imports - from bokeh.core.types import ID -diff --git a/tests/unit/bokeh/embed/test_standalone.py b/tests/unit/bokeh/embed/test_standalone.py -index d8a7e9468..6d27d4476 100644 ---- a/tests/unit/bokeh/embed/test_standalone.py -+++ b/tests/unit/bokeh/embed/test_standalone.py -@@ -26,7 +26,7 @@ from typing import Any - import bs4 - import numpy as np - from jinja2 import Template --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - from selenium.webdriver.common.by import By - from selenium.webdriver.remote.webdriver import WebDriver - -diff --git a/tests/unit/bokeh/embed/test_util__embed.py b/tests/unit/bokeh/embed/test_util__embed.py -index 9027bfac9..ee24a1629 100644 ---- a/tests/unit/bokeh/embed/test_util__embed.py -+++ b/tests/unit/bokeh/embed/test_util__embed.py -@@ -20,7 +20,7 @@ import pytest ; pytest - import logging - - # External imports --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Bokeh imports - from bokeh import __version__ -diff --git a/tests/unit/bokeh/io/test_notebook__io.py b/tests/unit/bokeh/io/test_notebook__io.py -index 6b28b4c2d..9a7dc84c4 100644 ---- a/tests/unit/bokeh/io/test_notebook__io.py -+++ b/tests/unit/bokeh/io/test_notebook__io.py -@@ -21,7 +21,7 @@ import json - from typing import Any - - # External imports --from mock import MagicMock, PropertyMock, patch -+from unittest.mock import MagicMock, PropertyMock, patch - - # Bokeh imports - from bokeh.document.document import Document -diff --git a/tests/unit/bokeh/io/test_output.py b/tests/unit/bokeh/io/test_output.py -index df2d939a5..107052b9c 100644 ---- a/tests/unit/bokeh/io/test_output.py -+++ b/tests/unit/bokeh/io/test_output.py -@@ -17,7 +17,7 @@ import pytest ; pytest - #----------------------------------------------------------------------------- - - # External imports --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Bokeh imports - from bokeh.io.state import curstate -diff --git a/tests/unit/bokeh/io/test_saving.py b/tests/unit/bokeh/io/test_saving.py -index f657a89c3..1709d44c8 100644 ---- a/tests/unit/bokeh/io/test_saving.py -+++ b/tests/unit/bokeh/io/test_saving.py -@@ -20,7 +20,7 @@ import pytest ; pytest - from pathlib import Path - - # External imports --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Bokeh imports - from bokeh.core.templates import FILE -diff --git a/tests/unit/bokeh/io/test_showing.py b/tests/unit/bokeh/io/test_showing.py -index 6c49a6d07..1e615b8c2 100644 ---- a/tests/unit/bokeh/io/test_showing.py -+++ b/tests/unit/bokeh/io/test_showing.py -@@ -17,7 +17,7 @@ import pytest ; pytest - #----------------------------------------------------------------------------- - - # External imports --from mock import MagicMock, Mock, patch -+from unittest.mock import MagicMock, Mock, patch - - # Bokeh imports - from bokeh.application.application import Application -diff --git a/tests/unit/bokeh/io/test_state.py b/tests/unit/bokeh/io/test_state.py -index 395811acc..d12f9fa74 100644 ---- a/tests/unit/bokeh/io/test_state.py -+++ b/tests/unit/bokeh/io/test_state.py -@@ -17,7 +17,7 @@ import pytest ; pytest - #----------------------------------------------------------------------------- - - # External imports --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Bokeh imports - from bokeh.document import Document -diff --git a/tests/unit/bokeh/io/test_util__io.py b/tests/unit/bokeh/io/test_util__io.py -index 3a4be5244..d18323294 100644 ---- a/tests/unit/bokeh/io/test_util__io.py -+++ b/tests/unit/bokeh/io/test_util__io.py -@@ -20,7 +20,7 @@ import pytest ; pytest - import os - - # External imports --from mock import ( -+from unittest.mock import ( - MagicMock, - Mock, - PropertyMock, -diff --git a/tests/unit/bokeh/models/test_annotations.py b/tests/unit/bokeh/models/test_annotations.py -index f1eef4443..57a64ede4 100644 ---- a/tests/unit/bokeh/models/test_annotations.py -+++ b/tests/unit/bokeh/models/test_annotations.py -@@ -20,7 +20,7 @@ import pytest ; pytest - from datetime import datetime - - # External imports --import mock -+from unittest import mock - - # Bokeh imports - from bokeh.core.properties import field, value -diff --git a/tests/unit/bokeh/models/test_mappers.py b/tests/unit/bokeh/models/test_mappers.py -index 1273f4911..130b77a31 100644 ---- a/tests/unit/bokeh/models/test_mappers.py -+++ b/tests/unit/bokeh/models/test_mappers.py -@@ -18,7 +18,7 @@ import pytest ; pytest - - # External imports - import pandas as pd --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Bokeh imports - from bokeh.core.validation import check_integrity, process_validation_issues -diff --git a/tests/unit/bokeh/models/test_plots.py b/tests/unit/bokeh/models/test_plots.py -index 8c1a66c17..7f4024cf7 100644 ---- a/tests/unit/bokeh/models/test_plots.py -+++ b/tests/unit/bokeh/models/test_plots.py -@@ -20,9 +20,9 @@ import pytest ; pytest - from math import isnan - - # External imports --import mock -+from unittest import mock -+from unittest.mock import MagicMock, patch - import xyzservices.providers as xyz --from mock import MagicMock, patch - - # Bokeh imports - from bokeh.core.validation import check_integrity, process_validation_issues -diff --git a/tests/unit/bokeh/models/test_ranges.py b/tests/unit/bokeh/models/test_ranges.py -index 7c71a8453..3bf9c745b 100644 ---- a/tests/unit/bokeh/models/test_ranges.py -+++ b/tests/unit/bokeh/models/test_ranges.py -@@ -21,7 +21,7 @@ import datetime as dt - from math import isnan - - # External imports --import mock -+from unittest import mock - - # Bokeh imports - from bokeh.core.validation import check_integrity, process_validation_issues -diff --git a/tests/unit/bokeh/plotting/test__decorators.py b/tests/unit/bokeh/plotting/test__decorators.py -index 5ee77137d..ea45289d7 100644 ---- a/tests/unit/bokeh/plotting/test__decorators.py -+++ b/tests/unit/bokeh/plotting/test__decorators.py -@@ -17,7 +17,7 @@ import pytest ; pytest - #----------------------------------------------------------------------------- - - # External imports --from mock import mock -+from unittest import mock - - # Bokeh imports - from bokeh.models import CDSView, Marker -diff --git a/tests/unit/bokeh/plotting/test__renderer.py b/tests/unit/bokeh/plotting/test__renderer.py -index 271cf196f..3337c550a 100644 ---- a/tests/unit/bokeh/plotting/test__renderer.py -+++ b/tests/unit/bokeh/plotting/test__renderer.py -@@ -19,7 +19,7 @@ import pytest ; pytest - # Bokeh imports - from bokeh.models import Circle - --#from mock import mock -+#from unittest import mock - - #from bokeh.plotting import figure - -diff --git a/tests/unit/bokeh/server/test_server__server.py b/tests/unit/bokeh/server/test_server__server.py -index a195fe4dc..5ced4affc 100644 ---- a/tests/unit/bokeh/server/test_server__server.py -+++ b/tests/unit/bokeh/server/test_server__server.py -@@ -26,7 +26,7 @@ import time - from datetime import timedelta - - # External imports --import mock -+from unittest import mock - import tornado - from _util_server import ( - http_get, -diff --git a/tests/unit/bokeh/server/test_session__server.py b/tests/unit/bokeh/server/test_session__server.py -index 42804ce41..f37156342 100644 ---- a/tests/unit/bokeh/server/test_session__server.py -+++ b/tests/unit/bokeh/server/test_session__server.py -@@ -17,7 +17,7 @@ import pytest ; pytest - #----------------------------------------------------------------------------- - - # External imports --import mock -+from unittest import mock - - # Bokeh imports - from bokeh.document import Document -diff --git a/tests/unit/bokeh/test___main__.py b/tests/unit/bokeh/test___main__.py -index 380409c30..539bb0b9b 100644 ---- a/tests/unit/bokeh/test___main__.py -+++ b/tests/unit/bokeh/test___main__.py -@@ -17,7 +17,7 @@ import pytest ; pytest - #----------------------------------------------------------------------------- - - # External imports --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Bokeh imports - from tests.support.util.api import verify_all -diff --git a/tests/unit/bokeh/test_client_server.py b/tests/unit/bokeh/test_client_server.py -index 5ca089f6e..41c497281 100644 ---- a/tests/unit/bokeh/test_client_server.py -+++ b/tests/unit/bokeh/test_client_server.py -@@ -23,7 +23,7 @@ import sys - - # External imports - from flaky import flaky --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - from tornado.httpclient import HTTPError - - # Bokeh imports -diff --git a/tests/unit/bokeh/test_layouts.py b/tests/unit/bokeh/test_layouts.py -index c5e620f2f..f07940bac 100644 ---- a/tests/unit/bokeh/test_layouts.py -+++ b/tests/unit/bokeh/test_layouts.py -@@ -17,7 +17,7 @@ import pytest ; pytest - #----------------------------------------------------------------------------- - - # External imports --import mock -+from unittest import mock - - # Bokeh imports - from bokeh.core.validation import check_integrity, process_validation_issues -diff --git a/tests/unit/bokeh/util/test_browser.py b/tests/unit/bokeh/util/test_browser.py -index a9bc18773..171aba69f 100644 ---- a/tests/unit/bokeh/util/test_browser.py -+++ b/tests/unit/bokeh/util/test_browser.py -@@ -22,7 +22,7 @@ import sys - import webbrowser - - # External imports --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Bokeh imports - from tests.support.util.env import envset -diff --git a/tests/unit/bokeh/util/test_compiler.py b/tests/unit/bokeh/util/test_compiler.py -index 03a7020ed..f8d2f0a87 100644 ---- a/tests/unit/bokeh/util/test_compiler.py -+++ b/tests/unit/bokeh/util/test_compiler.py -@@ -21,7 +21,7 @@ import json - import os - - # External imports --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Module under test - import bokeh.util.compiler as buc # isort:skip -diff --git a/tests/unit/bokeh/util/test_deprecation.py b/tests/unit/bokeh/util/test_deprecation.py -index 7945d1bb4..a77c16d22 100644 ---- a/tests/unit/bokeh/util/test_deprecation.py -+++ b/tests/unit/bokeh/util/test_deprecation.py -@@ -17,7 +17,7 @@ import pytest ; pytest - #----------------------------------------------------------------------------- - - # External imports --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Module under test - import bokeh.util.deprecation as dep # isort:skip -diff --git a/tests/unit/bokeh/util/test_package.py b/tests/unit/bokeh/util/test_package.py -index 73afb7944..8010eb1db 100644 ---- a/tests/unit/bokeh/util/test_package.py -+++ b/tests/unit/bokeh/util/test_package.py -@@ -17,7 +17,7 @@ import pytest ; pytest - #----------------------------------------------------------------------------- - - # External imports --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - # Module under test - import bokeh.util.package as bup # isort:skip -diff --git a/tests/unit/bokeh/util/test_sampledata__util.py b/tests/unit/bokeh/util/test_sampledata__util.py -index 0a7892a4f..4fb9ebf16 100644 ---- a/tests/unit/bokeh/util/test_sampledata__util.py -+++ b/tests/unit/bokeh/util/test_sampledata__util.py -@@ -17,7 +17,7 @@ import pytest ; pytest - #----------------------------------------------------------------------------- - - # External imports --from mock import call, patch -+from unittest.mock import call, patch - - # Module under test - import bokeh.util.sampledata as bus # isort:skip -diff --git a/tests/unit/bokeh/util/test_token.py b/tests/unit/bokeh/util/test_token.py -index cd94e10b5..9fe23377b 100644 ---- a/tests/unit/bokeh/util/test_token.py -+++ b/tests/unit/bokeh/util/test_token.py -@@ -24,7 +24,7 @@ import json - import random - - # External imports --from mock import MagicMock, Mock, patch -+from unittest.mock import MagicMock, Mock, patch - - # Bokeh imports - from bokeh.util.token import ( -diff --git a/tests/unit/bokeh/util/test_version.py b/tests/unit/bokeh/util/test_version.py -index 48667d036..bafe1ba95 100644 ---- a/tests/unit/bokeh/util/test_version.py -+++ b/tests/unit/bokeh/util/test_version.py -@@ -20,7 +20,7 @@ import pytest ; pytest - import re - - # External imports --import mock -+from unittest import mock - - # Module under test - import bokeh.util.version as buv # isort:skip diff --git a/bokeh-sys-executable.patch b/bokeh-sys-executable.patch deleted file mode 100644 index f9508e7..0000000 --- a/bokeh-sys-executable.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/tests/support/plugins/bokeh_server.py b/tests/support/plugins/bokeh_server.py -index c37f31bfa..50d786a4b 100644 ---- a/tests/support/plugins/bokeh_server.py -+++ b/tests/support/plugins/bokeh_server.py -@@ -55,7 +55,7 @@ __all__ = ( - def bokeh_server(request: pytest.FixtureRequest, log_file: IO[str]) -> str: - bokeh_port: int = request.config.option.bokeh_port - -- cmd = ["python", "-m", "bokeh", "serve"] -+ cmd = [sys.executable, "-m", "bokeh", "serve"] - argv = [f"--port={bokeh_port}"] - bokeh_server_url = f"http://localhost:{bokeh_port}" - -diff --git a/tests/test_examples.py b/tests/test_examples.py -index 7072f2f88..1dfb1a4e8 100644 ---- a/tests/test_examples.py -+++ b/tests/test_examples.py -@@ -268,7 +268,7 @@ with open(filename, 'rb') as example: - exec(compile(example.read(), filename, 'exec')) - """ - -- cmd = ["python", "-c", code] -+ cmd = [sys.executable, "-c", code] - cwd = dirname(example.path) - - env = os.environ.copy() diff --git a/python-bokeh.changes b/python-bokeh.changes index 15cacf7..200764b 100644 --- a/python-bokeh.changes +++ b/python-bokeh.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Sat Nov 19 20:33:42 UTC 2022 - Ben Greiner + +- Update to version 3.0.2 + ## bugfixes + * #4930 interaction between tooltips and gridplots + * #12429 [component: bokehjs] [BUG] Line selection does not + render the unselected end line segments + * #12531 [component: bokehjs] [BUG] latex in titles - upright + characters that should be italic + * #12551 [component: tests] bokehjs' unit tests fail on chromium + 107 + * #12554 [component: docs] Custom.js needs update for switcher + * #12578 [component: bokehjs] [BUG] gridplot reset button does + not reset all figures + * #12585 [component: bokehjs] [BUG] line_policy='none' for + HoverTool does not generate any tooltip + * #12587 [component: server] [BUG] Don't delete + importlib.metadata in __init__.py + * #12593 [BUG] Guard numpy.typing.ArrayType with `if + TYPE_CHECKING` + ## tasks + * #12557 [component: docs] Need automation for updating + switcher.json + * #12560 [FEATURE] remove mock + * #12562 [BUG] Tests: "python" is not a guaranteed executable + * #12566 [component: docs] Fix dates and typo in release docs for + 3.0.0/3.0.1 + * #12569 [component: build] Add Python 3.11 to CI + * #12571 [component: tests] Remove flaky from integration tests + * #12573 [component: tests] Add a regression test for issue #4888 + * #12579 Upgrade to mypy 0.990 + * #12581 Disable Selenium integration tests for now + * #12597 Backports for 3.0.2 + * #12600 Updates for 3.0.2 + ------------------------------------------------------------------- Fri Nov 4 15:23:00 UTC 2022 - Ben Greiner diff --git a/python-bokeh.spec b/python-bokeh.spec index 84a6cfa..8d9181d 100644 --- a/python-bokeh.spec +++ b/python-bokeh.spec @@ -29,7 +29,7 @@ %bcond_with testexamples Name: python-bokeh%{psuffix} -Version: 3.0.1 +Version: 3.0.2 Release: 0 Summary: Statistical interactive HTML plots for Python License: BSD-3-Clause @@ -41,10 +41,6 @@ Source0: https://files.pythonhosted.org/packages/source/b/bokeh/bokeh-%{v Source1: https://github.com/bokeh/bokeh/archive/refs/tags/%{version}.tar.gz#/bokeh-%{version}-gh.tar.gz # Sampledata: `rm -rf .bokeh && HOME=$PWD bokeh sampledata && tar cJf bokeh-sampledata.tar.xz .bokeh` Source99: bokeh-sampledata.tar.xz -# PATCH-FIX-UPSTREAM bokeh-remove-mock.patch gh#bokeh/bokeh#12561 -Patch1: bokeh-remove-mock.patch -# PATCH-FIX-UPSTREAM bokeh-sys-executable.patch gh#bokeh/bokeh#12563 -Patch2: bokeh-sys-executable.patch BuildRequires: %{python_module Jinja2 >= 2.9} BuildRequires: %{python_module Pillow >= 7.1.0} BuildRequires: %{python_module PyYAML >= 3.10} @@ -113,8 +109,6 @@ with interactivity over large or streaming datasets. %setup -q -n bokeh-%{version} %else %setup -q -n bokeh-%{version} -T -b1 -a99 -%patch1 -p1 -%patch2 -p1 %endif %if !%{with test} @@ -157,6 +151,7 @@ deselectname+=" or test__ioloop_not_forcibly_stopped" deselectname+=" or test_defaults" # flaky timeouts deselectname+=" or (test_deprecation and (test_since or test_message))" +deselectname+=" or (test_document_lifecycle and test_document_on_session_destroyed_exceptions)" # test can't list modules correctly in test environment deselectname+=" or (codebase and combined)" # extraneous fields From d89e8501de3b4f684a56bdd86acdba546647f30c0b763f73cd8961cde5601043 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 20 Nov 2022 21:10:45 +0000 Subject: [PATCH 2/3] Accepting request 1036976 from home:bnavigator:branches:devel:languages:python:numeric Mention patch drop OBS-URL: https://build.opensuse.org/request/show/1036976 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-bokeh?expand=0&rev=64 --- python-bokeh.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/python-bokeh.changes b/python-bokeh.changes index 200764b..340d0c0 100644 --- a/python-bokeh.changes +++ b/python-bokeh.changes @@ -33,6 +33,7 @@ Sat Nov 19 20:33:42 UTC 2022 - Ben Greiner * #12581 Disable Selenium integration tests for now * #12597 Backports for 3.0.2 * #12600 Updates for 3.0.2 +- Remove bokeh-remove-mock.patch gh#bokeh/bokeh#12561 ------------------------------------------------------------------- Fri Nov 4 15:23:00 UTC 2022 - Ben Greiner From 8d1b545f06630913c0ba64e704d2b93f631a9d1580d24b55c8889ec2abc6d278 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 20 Nov 2022 21:11:31 +0000 Subject: [PATCH 3/3] - Remove bokeh-remove-mock.patch gh#bokeh/bokeh#12561: upstream - Remove bokeh-sys-executable.patch gh#bokeh/bokeh#12563: upstream OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-bokeh?expand=0&rev=65 --- python-bokeh.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-bokeh.changes b/python-bokeh.changes index 340d0c0..2bee28b 100644 --- a/python-bokeh.changes +++ b/python-bokeh.changes @@ -33,7 +33,8 @@ Sat Nov 19 20:33:42 UTC 2022 - Ben Greiner * #12581 Disable Selenium integration tests for now * #12597 Backports for 3.0.2 * #12600 Updates for 3.0.2 -- Remove bokeh-remove-mock.patch gh#bokeh/bokeh#12561 +- Remove bokeh-remove-mock.patch gh#bokeh/bokeh#12561: upstream +- Remove bokeh-sys-executable.patch gh#bokeh/bokeh#12563: upstream ------------------------------------------------------------------- Fri Nov 4 15:23:00 UTC 2022 - Ben Greiner