Load bokeh wheels from central location in CDN (#5638)

holoviz · Oct 15, 2023 · 321a10e · 321a10e
1 parent 22acd05
commit 321a10e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/panel/io/convert.py b/panel/io/convert.py
@@ -29,7 +29,7 @@
 from .markdown import build_single_handler_application
 from .mime_render import find_imports
 from .resources import (
-    BASE_TEMPLATE, CDN_DIST, DIST_DIR, INDEX_TEMPLATE, Resources,
+    BASE_TEMPLATE, CDN_DIST, CDN_ROOT, DIST_DIR, INDEX_TEMPLATE, Resources,
     _env as _pn_env, bundle_resources, loading_css, set_resource_mode,
 )
 from .state import set_curdoc, state
@@ -47,7 +47,7 @@
 PANEL_LOCAL_WHL = DIST_DIR / 'wheels' / f'panel-{__version__.replace("-dirty", "")}-py3-none-any.whl'
 BOKEH_LOCAL_WHL = DIST_DIR / 'wheels' / f'bokeh-{BOKEH_VERSION}-py3-none-any.whl'
 PANEL_CDN_WHL = f'{CDN_DIST}wheels/panel-{PY_VERSION}-py3-none-any.whl'
-BOKEH_CDN_WHL = f'{CDN_DIST}wheels/bokeh-{BOKEH_VERSION}-py3-none-any.whl'
+BOKEH_CDN_WHL = f'{CDN_ROOT}wheels/bokeh-{BOKEH_VERSION}-py3-none-any.whl'
 PYODIDE_URL = f'https://cdn.jsdelivr.net/pyodide/{PYODIDE_VERSION}/full/pyodide.js'
 PYODIDE_PYC_URL = f'https://cdn.jsdelivr.net/pyodide/{PYODIDE_VERSION}/pyc/pyodide.js'
 PYSCRIPT_CSS = f'<link rel="stylesheet" href="https://pyscript.net/releases/{PYSCRIPT_VERSION}/pyscript.css" />'

diff --git a/panel/io/resources.py b/panel/io/resources.py
@@ -87,7 +87,8 @@ def conffilter(value):
 BASIC_LOGIN_TEMPLATE = _env.get_template('basic_login.html')
 DEFAULT_TITLE = "Panel Application"
 JS_RESOURCES = _env.get_template('js_resources.html')
-CDN_URL = f"https://cdn.holoviz.org/panel/{JS_VERSION}/"
+CDN_ROOT = "https://cdn.holoviz.org/panel/"
+CDN_URL = f"{CDN_ROOT}{JS_VERSION}/"
 CDN_DIST = f"{CDN_URL}dist/"
 DOC_DIST = "https://panel.holoviz.org/_static/"
 LOCAL_DIST = "static/extensions/panel/"

diff --git a/scripts/cdn_upload.py b/scripts/cdn_upload.py
@@ -9,5 +9,7 @@
 
 sp = subprocess.Popen(['aws', 's3', 'sync', 'panel/dist', f's3://cdn.holoviz.org/panel/{js_version}/dist/'])
 sp.wait()
-sp2 = subprocess.Popen(['aws', 's3', 'cp', 'panel/package.json', f's3://cdn.holoviz.org/panel/{js_version}/package.json'])
+sp2 = subprocess.Popen(['aws', 's3', 'sync', 'panel/dist/wheels/bokeh*', f's3://cdn.holoviz.org/panel/wheels/'])
 sp2.wait()
+sp3 = subprocess.Popen(['aws', 's3', 'cp', 'panel/package.json', f's3://cdn.holoviz.org/panel/{js_version}/package.json'])
+sp3.wait()