From dac16874a47f2dfddf450a2354ac3c9f9bfa4956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Mon, 16 Sep 2024 17:57:57 +0200 Subject: [PATCH 1/4] Add cdn urls to be able to build pyodide-lock.json --- scripts/jupyterlite/extra_packages.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/jupyterlite/extra_packages.json b/scripts/jupyterlite/extra_packages.json index 3d15b58add..83ae24affc 100644 --- a/scripts/jupyterlite/extra_packages.json +++ b/scripts/jupyterlite/extra_packages.json @@ -1,5 +1,5 @@ [ - "panel", - "bokeh", + "https://cdn.holoviz.org/panel/1.5.0/dist/wheels/panel-1.5.0-py3-none-any.whl", + "https://cdn.holoviz.org/panel/1.5.0/dist/wheels/bokeh-3.5.2-py3-none-any.whl", "pyodide-http" ] From d203e06454da9880bae73a46fb97e57457d039f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Mon, 16 Sep 2024 18:20:02 +0200 Subject: [PATCH 2/4] Change bash -el to bash -l --- .github/workflows/build.yaml | 2 +- .github/workflows/docs.yaml | 2 +- .github/workflows/test.yaml | 12 ++++-------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d3621631a8..c37f17b395 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,7 +13,7 @@ on: defaults: run: - shell: bash -el {0} + shell: bash -l {0} env: PACKAGE: "panel" diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 996758cd76..b0071662b6 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -23,7 +23,7 @@ on: defaults: run: - shell: bash -el {0} + shell: bash -l {0} env: DISPLAY: ":99.0" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index baed70a8d0..c1a43910ad 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -29,7 +29,7 @@ concurrency: defaults: run: - shell: bash -el {0} + shell: bash -l {0} env: DISPLAY: ":99.0" @@ -199,17 +199,13 @@ jobs: id: install - name: Build pyodide wheels run: pixi run -e test-ui "python ./scripts/build_pyodide_wheels.py" - - name: Set environment variables for macOS - if: contains(matrix.os, 'macos') - run: | - pixi shell-hook -e test-ui >> $HOME/.bashrc - name: Launch JupyterLab - shell: pixi run -e test-ui bash -el {0} + shell: pixi run -e test-ui bash -l {0} run: | jupyter server extension enable panel.io.jupyter_server_extension --sys-prefix (jupyter lab --config panel/tests/ui/jupyter_server_test_config.py --port 8887 > /tmp/jupyterlab_server.log 2>&1) & - name: Build JupyterLite - shell: pixi run -e test-ui bash -el {0} + shell: pixi run -e test-ui bash -l {0} run: pixi run -e lite lite-build - name: Wait for JupyterLab uses: ifaxity/wait-on-action@v1.2.1 @@ -231,7 +227,7 @@ jobs: if-no-files-found: ignore - name: Stop JupyterLab if: always() - shell: pixi run -e test-ui bash -el {0} + shell: pixi run -e test-ui bash -l {0} run: | jupyter lab stop 8887 || true - uses: codecov/codecov-action@v4 From 8b81fb130353f82c94f40f868a80b41413726db3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Mon, 16 Sep 2024 18:32:01 +0200 Subject: [PATCH 3/4] Revert "Change bash -el to bash -l" This reverts commit d203e06454da9880bae73a46fb97e57457d039f4. --- .github/workflows/build.yaml | 2 +- .github/workflows/docs.yaml | 2 +- .github/workflows/test.yaml | 12 ++++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c37f17b395..d3621631a8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,7 +13,7 @@ on: defaults: run: - shell: bash -l {0} + shell: bash -el {0} env: PACKAGE: "panel" diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index b0071662b6..996758cd76 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -23,7 +23,7 @@ on: defaults: run: - shell: bash -l {0} + shell: bash -el {0} env: DISPLAY: ":99.0" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c1a43910ad..baed70a8d0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -29,7 +29,7 @@ concurrency: defaults: run: - shell: bash -l {0} + shell: bash -el {0} env: DISPLAY: ":99.0" @@ -199,13 +199,17 @@ jobs: id: install - name: Build pyodide wheels run: pixi run -e test-ui "python ./scripts/build_pyodide_wheels.py" + - name: Set environment variables for macOS + if: contains(matrix.os, 'macos') + run: | + pixi shell-hook -e test-ui >> $HOME/.bashrc - name: Launch JupyterLab - shell: pixi run -e test-ui bash -l {0} + shell: pixi run -e test-ui bash -el {0} run: | jupyter server extension enable panel.io.jupyter_server_extension --sys-prefix (jupyter lab --config panel/tests/ui/jupyter_server_test_config.py --port 8887 > /tmp/jupyterlab_server.log 2>&1) & - name: Build JupyterLite - shell: pixi run -e test-ui bash -l {0} + shell: pixi run -e test-ui bash -el {0} run: pixi run -e lite lite-build - name: Wait for JupyterLab uses: ifaxity/wait-on-action@v1.2.1 @@ -227,7 +231,7 @@ jobs: if-no-files-found: ignore - name: Stop JupyterLab if: always() - shell: pixi run -e test-ui bash -l {0} + shell: pixi run -e test-ui bash -el {0} run: | jupyter lab stop 8887 || true - uses: codecov/codecov-action@v4 From c16b90810aeb7839ee3f50ffa81c71906ad428bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Tue, 17 Sep 2024 12:22:39 +0200 Subject: [PATCH 4/4] Remove work-around --- .github/workflows/test.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index baed70a8d0..f330f061b0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -199,10 +199,6 @@ jobs: id: install - name: Build pyodide wheels run: pixi run -e test-ui "python ./scripts/build_pyodide_wheels.py" - - name: Set environment variables for macOS - if: contains(matrix.os, 'macos') - run: | - pixi shell-hook -e test-ui >> $HOME/.bashrc - name: Launch JupyterLab shell: pixi run -e test-ui bash -el {0} run: |