From 1004b44b3e2074c18b9329137bffed25fd595e3a Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <prudiger@anaconda.com>
Date: Tue, 16 Jul 2024 14:48:04 +0200
Subject: [PATCH 1/4] Bump bokeh version to 3.5.0

---
 panel/package-lock.json | 8 ++++----
 panel/package.json      | 2 +-
 pixi.toml               | 2 +-
 pyproject.toml          | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/panel/package-lock.json b/panel/package-lock.json
index 63d6921424..b5c10a7549 100644
--- a/panel/package-lock.json
+++ b/panel/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.5.0-a.8",
       "license": "BSD-3-Clause",
       "dependencies": {
-        "@bokeh/bokehjs": "3.5.0-rc.1",
+        "@bokeh/bokehjs": "3.5.0",
         "@types/debounce": "^1.2.0",
         "@types/gl-matrix": "^2.4.5",
         "ace-code": "^1.24.1",
@@ -41,9 +41,9 @@
       }
     },
     "node_modules/@bokeh/bokehjs": {
-      "version": "3.5.0-rc.1",
-      "resolved": "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-3.5.0-rc.1.tgz",
-      "integrity": "sha512-WOUBY6ILHRUESxB24BpYqvaHym73CaqWRNskzWwb1p9QgnLwtJwhL7ibtREg/fuO+ifTpfCDoKSHaP3jmbflyQ==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-3.5.0.tgz",
+      "integrity": "sha512-9BdydcclXPmEIq8C12+d44HZZgxLooseugdHi/uo0Rd7Xgmvqs3SfjjtgpHKYCfzcI20v0XgjdMhjiwmq068hw==",
       "workspaces": [
         "./make",
         "./src/compiler",
diff --git a/panel/package.json b/panel/package.json
index 4b33492c81..77de655862 100644
--- a/panel/package.json
+++ b/panel/package.json
@@ -8,7 +8,7 @@
     "url": "https://github.com/holoviz/panel.git"
   },
   "dependencies": {
-    "@bokeh/bokehjs": "3.5.0-rc.1",
+    "@bokeh/bokehjs": "3.5.0",
     "@types/debounce": "^1.2.0",
     "@types/gl-matrix": "^2.4.5",
     "ace-code": "^1.24.1",
diff --git a/pixi.toml b/pixi.toml
index 0f1eaea10e..511c2bc977 100644
--- a/pixi.toml
+++ b/pixi.toml
@@ -22,7 +22,7 @@ lint = ["py311", "lint"]
 
 [dependencies]
 bleach = "*"
-bokeh = "==3.5.0rc1"
+bokeh = ">=3.5.0,<3.6.0"
 linkify-it-py = "*"
 markdown = "*"
 markdown-it-py = "*"
diff --git a/pyproject.toml b/pyproject.toml
index 1f6d76c395..b2f3f050cd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@ requires = [
     "hatchling",
     "hatch-vcs",
     "param >=2.1.0",
-    "bokeh ==3.5.0rc1",
+    "bokeh >=3.5.0,<3.6.0",
     "pyviz_comms >=0.7.4",
     "requests",
     "packaging",
@@ -47,7 +47,7 @@ classifiers = [
 ]
 
 dependencies = [
-    'bokeh ==3.5.0rc1',
+    'bokeh >=3.5.0,<3.6.0',
     'param >=2.1.0,<3.0',
     'pyviz_comms >=2.0.0',
     'markdown',

From 2775e9ced6e3fbd4a4097852bafac6235d195a46 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <prudiger@anaconda.com>
Date: Tue, 16 Jul 2024 15:05:34 +0200
Subject: [PATCH 2/4] Pin holoviews in tests

---
 pixi.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pixi.toml b/pixi.toml
index 511c2bc977..d2494980f2 100644
--- a/pixi.toml
+++ b/pixi.toml
@@ -37,7 +37,7 @@ requests = "*"
 tqdm = ">=4.48.0"
 typing_extensions = "*"
 # Recommended
-holoviews = ">=1.16.0"
+holoviews = ">=1.19.1"
 jupyterlab = "*"
 matplotlib-base = "*"
 pillow = "*"

From 5a62ef4f7062a170b7d2d4e04b516593e822a0b5 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <prudiger@anaconda.com>
Date: Tue, 16 Jul 2024 15:25:37 +0200
Subject: [PATCH 3/4] Pin numpy for now

---
 pixi.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pixi.toml b/pixi.toml
index d2494980f2..07f6e6ad3e 100644
--- a/pixi.toml
+++ b/pixi.toml
@@ -28,6 +28,7 @@ markdown = "*"
 markdown-it-py = "*"
 mdit-py-plugins = "*"
 nodejs = "*"
+numpy = "<2.0" # Temporary pin until panel release with support for bokeh 3.5.0 is available
 packaging = "*"
 pandas = ">=1.2"
 param = ">=2.1.0,<3.0"
@@ -37,7 +38,7 @@ requests = "*"
 tqdm = ">=4.48.0"
 typing_extensions = "*"
 # Recommended
-holoviews = ">=1.19.1"
+holoviews = ">=1.18.0"
 jupyterlab = "*"
 matplotlib-base = "*"
 pillow = "*"

From 0b428212102bc57c38c38eef6420c1b3a6ab879d Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <prudiger@anaconda.com>
Date: Tue, 16 Jul 2024 16:30:15 +0200
Subject: [PATCH 4/4] Revert holoviews pin

---
 pixi.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pixi.toml b/pixi.toml
index 07f6e6ad3e..0e730c8b52 100644
--- a/pixi.toml
+++ b/pixi.toml
@@ -38,7 +38,7 @@ requests = "*"
 tqdm = ">=4.48.0"
 typing_extensions = "*"
 # Recommended
-holoviews = ">=1.18.0"
+holoviews = ">=1.16.0"
 jupyterlab = "*"
 matplotlib-base = "*"
 pillow = "*"