diff --git a/panel-1.1.0.tar.gz b/panel-1.1.0.tar.gz deleted file mode 100644 index 815bb44..0000000 --- a/panel-1.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76ba4eac8bb178d032e3dd2a9c966cc8c088425f86eb567b06ed13baa84b4eb0 -size 25709311 diff --git a/panel-1.1.1.tar.gz b/panel-1.1.1.tar.gz new file mode 100644 index 0000000..564a9b5 --- /dev/null +++ b/panel-1.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:956f053f2b3674516c0fe928c27bf2e7080e0ee669dd3e05f27b9bad19cdf24f +size 25401416 diff --git a/panel-pr5185-bokeh3.2.patch b/panel-pr5185-bokeh3.2.patch new file mode 100644 index 0000000..1711938 --- /dev/null +++ b/panel-pr5185-bokeh3.2.patch @@ -0,0 +1,99 @@ +From 1ec8788110933887517ae1bd404481aa84fa130b Mon Sep 17 00:00:00 2001 +From: Philipp Rudiger +Date: Thu, 29 Jun 2023 13:54:57 +0200 +Subject: [PATCH] Bump bokeh version to 3.2 + +--- + panel/package-lock.json | 14 +++++++------- + panel/package.json | 2 +- + pyproject.toml | 2 +- + setup.py | 4 ++-- + 4 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/panel/package-lock.json b/panel/package-lock.json +index 6811cec0f4..10162fc1ee 100644 +--- a/panel/package-lock.json ++++ b/panel/package-lock.json +@@ -9,7 +9,7 @@ + "version": "1.1.1", + "license": "BSD-3-Clause", + "dependencies": { +- "@bokeh/bokehjs": "~3.1.1", ++ "@bokeh/bokehjs": "~3.2.0", + "@luma.gl/constants": "^8.0.3", + "@types/debounce": "^1.2.0", + "@types/gl-matrix": "^2.4.5", +@@ -24,9 +24,9 @@ + } + }, + "node_modules/@bokeh/bokehjs": { +- "version": "3.1.1", +- "resolved": "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-3.1.1.tgz", +- "integrity": "sha512-+S3hqhIaOS17Xp0Oy7fB+hhOPe+v3jeIew40sWaH4/DEEMuUmhDZZMFowWhicuwTN9J6Bay9bp/62YJc5Na1Qg==", ++ "version": "3.2.0", ++ "resolved": "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-3.2.0.tgz", ++ "integrity": "sha512-YxKpc9IRux99S+SW1vqHA+H8X5nFwPWKQ/xlI14dJPHtnsQKkzPG1qXpWhjN/WBOu/H8urWPfIqBow976F3h0g==", + "engines": { + "node": ">=16.0", + "npm": ">=8.0" +@@ -79,9 +79,9 @@ + }, + "dependencies": { + "@bokeh/bokehjs": { +- "version": "3.1.1", +- "resolved": "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-3.1.1.tgz", +- "integrity": "sha512-+S3hqhIaOS17Xp0Oy7fB+hhOPe+v3jeIew40sWaH4/DEEMuUmhDZZMFowWhicuwTN9J6Bay9bp/62YJc5Na1Qg==" ++ "version": "3.2.0", ++ "resolved": "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-3.2.0.tgz", ++ "integrity": "sha512-YxKpc9IRux99S+SW1vqHA+H8X5nFwPWKQ/xlI14dJPHtnsQKkzPG1qXpWhjN/WBOu/H8urWPfIqBow976F3h0g==" + }, + "@luma.gl/constants": { + "version": "8.1.0" +diff --git a/panel/package.json b/panel/package.json +index 97c1ca5b8c..f0596746b1 100644 +--- a/panel/package.json ++++ b/panel/package.json +@@ -8,7 +8,7 @@ + "url": "https://github.com/holoviz/panel.git" + }, + "dependencies": { +- "@bokeh/bokehjs": "~3.1.1", ++ "@bokeh/bokehjs": "~3.2.0", + "@luma.gl/constants": "^8.0.3", + "@types/debounce": "^1.2.0", + "@types/gl-matrix": "^2.4.5", +diff --git a/pyproject.toml b/pyproject.toml +index 3f3eb26c61..a6d69a2050 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -3,7 +3,7 @@ requires = [ + "param >=1.9.2", + "pyct >=0.4.4", + "setuptools >=42", +- "bokeh >=3.1.1,<3.2.0", ++ "bokeh >=3.1.1,<3.3.0", + "pyviz_comms >=0.7.4", + "requests", + "bleach", +diff --git a/setup.py b/setup.py +index 121f34b308..034fd3f899 100644 +--- a/setup.py ++++ b/setup.py +@@ -101,7 +101,7 @@ def run(self): + ########## dependencies ########## + + install_requires = [ +- 'bokeh >=3.1.1,<3.2.0', ++ 'bokeh >=3.1.1,<3.3.0', + 'param >=1.12.0', + 'pyviz_comms >=0.7.4', + 'xyzservices >=2021.09.1', # Bokeh dependency, but pyodide 23.0.0 does not always pick it up +@@ -218,7 +218,7 @@ def run(self): + 'setuptools >=42', + 'requests', + 'packaging', +- 'bokeh >=3.1.1,<3.2.0', ++ 'bokeh >=3.1.1,<3.3.0', + 'pyviz_comms >=0.7.4', + 'bleach', + 'tqdm >=4.48.0', diff --git a/python-panel.changes b/python-panel.changes index 36a2951..41c5296 100644 --- a/python-panel.changes +++ b/python-panel.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Wed Jul 5 09:12:20 UTC 2023 - Ben Greiner + +- Update to 1.1.1 + ## Enhancements + * Implement per_session cache (#5117) + * Enhancements for ChatBox including methods to update rows and + hide names (#5118, #5118) + ## Bug fixes + * Fix Progress indicator sizing_mode (#5051) + * Fix various ChatBox issues (#5065, #5101, #5101) + * Ensure kernel shutdown futures are not collected in Jupyter + server extension (#5069) + * Add bokeh version check for notebook to better support bokeh + dev versions (#5071, #5093) + * Fix false warning emitted when constructing a Param pane with + throttled or onkeyup (#5078) + * Allow to updating/clearing enabled_dates on DatetimePicker + (#5089) + * Ensure session arguments are correctly parsed by Jupyter + executor (#5106) + * Fix defer_load handling (#5107) + * Fix styling with filters in Tabulator (#5110) + * Fix issues when using in filter with single value on Tabulator + (#5125) + * Add fallback if ReactiveHTML shadow DOM lookup fails (#5126) + * Allow automatic loading of extensions during launch and warn + about missing extensions (#5144) + * Correctly process fields on Vega (and altair) selections + (#5145) + * Immediately dispatch ColumnDataChangedEvent fixing Plotly plots + not updating (#5147) + ## Compatibility + * Correctly serialize new IPyWidget models on creation (#5114) + * Ensure we handle JupyterLab 4 comm messages correctly (#5140) + ## Backward compatibility + * Renamed Trend parameter title to name (#5092) +- Add panel-pr5185-bokeh3.2.patch gh#holoviz/panel#5185 + * Bump bokeh upper pin +- Don't test on 32-bit it fails randomly + ------------------------------------------------------------------- Wed Jun 7 15:37:00 UTC 2023 - Ben Greiner diff --git a/python-panel.spec b/python-panel.spec index 3237be0..488b34b 100644 --- a/python-panel.spec +++ b/python-panel.spec @@ -26,7 +26,7 @@ %endif Name: python-panel%{psuffix} -Version: 1.1.0 +Version: 1.1.1 Release: 0 Summary: A high level app and dashboarding solution for Python License: BSD-3-Clause @@ -34,9 +34,11 @@ Group: Development/Languages/Python URL: https://panel.holoviz.org Source: https://files.pythonhosted.org/packages/source/p/panel/panel-%{version}.tar.gz Source99: python-panel-rpmlintrc +# PATCH-FIX-UPSTREAM panel-pr5185-bokeh3.2.patch gh#holoviz/panel#5185 +Patch0: https://github.com/holoviz/panel/pull/5185.patch#/panel-pr5185-bokeh3.2.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module bleach} -BuildRequires: %{python_module bokeh >= 3.1.1 with %python-bokeh < 3.2} +BuildRequires: %{python_module bokeh >= 3.1.1 with %python-bokeh < 3.3} BuildRequires: %{python_module packaging} BuildRequires: %{python_module param >= 1.9.2} BuildRequires: %{python_module pip} @@ -61,6 +63,8 @@ BuildRequires: %{python_module ipython >= 7.0} BuildRequires: %{python_module panel = %{version}} BuildRequires: %{python_module parameterized} BuildRequires: %{python_module plotly >= 4.0} +BuildRequires: %{python_module pytest-asyncio} +BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module pytest} BuildRequires: %{python_module scipy} BuildRequires: %{python_module streamz} @@ -80,7 +84,7 @@ Requires: python-requests Requires: python-tqdm >= 4.48.0 Requires: python-typing_extensions Requires: python-xyzservices >= 2021.09.1 -Requires: (python-bokeh >= 3.1.1 with python-bokeh < 3.2.0) +Requires: (python-bokeh >= 3.1.1 with python-bokeh < 3.3.0) Requires(post): update-alternatives Requires(postun):update-alternatives Recommends: python-Pillow @@ -146,7 +150,12 @@ donttest="$donttest or (test_svg_scale_ and True)" donttest="$donttest or (test_svg_stretch_ and True)" # flaky async test donttest="$donttest or test_server_async_callbacks" -%pytest -ra -k "not ($donttest)" +# upstream skips it for win and osx, we skip it because it (flakily) terminates everything on aarch64 +donttest="$donttest or (test_terminal and test_subprocess)" +# Don't test on 32-bit: asyncio is too flaky +[ $(getconf LONG_BIT) -eq 32 ] && exit 0 +# +%pytest -n auto -rsfE -k "not ($donttest)" %endif %post