diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index a265234ac2..2b10e84298 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -37,7 +37,7 @@ jobs: DISPLAY: ":99.0" PANEL_IPYWIDGET: 1 steps: - - uses: holoviz-dev/holoviz_tasks/install@v0.1a15 + - uses: holoviz-dev/holoviz_tasks/install@v0.1a18 with: name: doc_build python-version: "3.9" @@ -53,7 +53,13 @@ jobs: if: steps.install.outputs.cache-hit != 'true' run: | conda activate test-environment - pip install --use-deprecated=legacy-resolver pyecharts ipywidgets_bokeh==1.4.0.dev3 + pip install --use-deprecated=legacy-resolver pyecharts ipywidgets_bokeh==1.5.0 + - name: install bokeh-dev + if: | + (github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'dev') || + (github.event_name == 'push' && (contains(steps.vars.outputs.tag, 'a') || contains(steps.vars.outputs.tag, 'b') || contains(steps.vars.outputs.tag, 'rc'))) + run: | + pip install --pre --upgrade bokeh - name: bokeh sampledata run: | conda activate test-environment diff --git a/panel/package-lock.json b/panel/package-lock.json index 1de656c1aa..93df15dc22 100644 --- a/panel/package-lock.json +++ b/panel/package-lock.json @@ -9,7 +9,7 @@ "version": "1.3.1", "license": "BSD-3-Clause", "dependencies": { - "@bokeh/bokehjs": "~3.3.0", + "@bokeh/bokehjs": "~3.3.1-rc.1", "@luma.gl/constants": "^8.0.3", "@types/debounce": "^1.2.0", "@types/gl-matrix": "^2.4.5", @@ -38,9 +38,9 @@ } }, "node_modules/@bokeh/bokehjs": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-3.3.0.tgz", - "integrity": "sha512-Y8wWO6VLkOPOMMrwMFPLcfTnTyi8vK+elMrxhxurU8E5IyABB9VypwTfSDCEnQsurGybm6f9OBH3YehUlRY/pQ==", + "version": "3.3.1-rc.1", + "resolved": "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-3.3.1-rc.1.tgz", + "integrity": "sha512-u/rWOzPOYbMIqsYfvvjL2fdPAwbSvZeSw0nAdbrF5ZOjwT2gyQKLmSAla7PF0cQKFHi4MtUDf1JLM7ygMxCtig==", "engines": { "node": ">=16.0", "npm": ">=8.0" @@ -1636,9 +1636,9 @@ "dev": true }, "@bokeh/bokehjs": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-3.3.0.tgz", - "integrity": "sha512-Y8wWO6VLkOPOMMrwMFPLcfTnTyi8vK+elMrxhxurU8E5IyABB9VypwTfSDCEnQsurGybm6f9OBH3YehUlRY/pQ==" + "version": "3.3.1-rc.1", + "resolved": "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-3.3.1-rc.1.tgz", + "integrity": "sha512-u/rWOzPOYbMIqsYfvvjL2fdPAwbSvZeSw0nAdbrF5ZOjwT2gyQKLmSAla7PF0cQKFHi4MtUDf1JLM7ygMxCtig==" }, "@eslint-community/eslint-utils": { "version": "4.4.0", diff --git a/panel/package.json b/panel/package.json index e09df9424e..62a2e1a797 100644 --- a/panel/package.json +++ b/panel/package.json @@ -8,7 +8,7 @@ "url": "https://github.com/holoviz/panel.git" }, "dependencies": { - "@bokeh/bokehjs": "~3.3.0", + "@bokeh/bokehjs": "~3.3.1-rc.1", "@luma.gl/constants": "^8.0.3", "@types/debounce": "^1.2.0", "@types/gl-matrix": "^2.4.5",