merge main

voila-dashboards · Oct 10, 2024 · 6f07177 · 6f07177
2 parents ef6ec74 + f1722f4
commit 6f07177
Show file tree

Hide file tree

Showing 14 changed files with 652 additions and 627 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,6 +10,10 @@ on:
   schedule:
     - cron: '0 2 * * 1-5' # run on weekdays at 2:00am UTC
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml
@@ -7,6 +7,10 @@ on:
     branches:
       - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 permissions:
   contents: write
 
@@ -27,7 +31,7 @@ jobs:
           version_spec: next
 
       - name: Upload Distributions
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: voila-releaser-dist-${{ github.run_number }}
           path: .jupyter_releaser_checkout/dist
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,6 +10,10 @@ on:
   schedule:
     - cron: '0 2 * * 1-5' # run on weekdays at 2:00am UTC
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test-linux:
     runs-on: ${{ matrix.os }}
@@ -70,7 +74,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-12]
+        os: [macos]
         python_version: ['3.8', '3.9', '3.10', '3.11']
 
     steps:
@@ -116,7 +120,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 

diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
@@ -8,6 +8,10 @@ on:
     branches:
       - '*'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   PIP_DISABLE_PIP_VERSION_CHECK: 1
 
@@ -46,7 +50,7 @@ jobs:
           sha256sum * | tee SHA256SUMS
 
       - name: Upload distributions
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: dist ${{ github.run_number }}
           path: ./dist
@@ -72,11 +76,10 @@ jobs:
             py_cmd: python
     steps:
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
-          architecture: 'x64'
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: dist ${{ github.run_number }}
           path: ./dist

diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
@@ -2,14 +2,17 @@ name: UI Tests
 
 on: [push, pull_request]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   ui-tests:
     name: Visual Regression
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8]
-        node-version: [18.x]
+        jupyter-server-version: ["1.24.0", "2.14.2"]
       fail-fast: false
 
     steps:
@@ -22,6 +25,7 @@ jobs:
           python -m pip install -r requirements-visual-test.txt
           python -m pip install jupyterlab_miami_nights --no-deps
           python -m pip install ".[test]"
+          python -m pip install jupyter-server==${{ matrix.jupyter-server-version }}
           jlpm
           jlpm build
           jupyter labextension develop . --overwrite
@@ -50,23 +54,23 @@ jobs:
 
       - name: Upload Playwright Test assets
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: voila-test-assets
           path: |
             ui-tests/test-results
 
       - name: Upload Playwright Benchmark report
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: voila-benchmark-report
           path: |
             ui-tests/benchmark-results
 
       - name: Upload Playwright Test report
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: voila-test-report
           path: |

diff --git a/packages/voila/package.json b/packages/voila/package.json
@@ -11,8 +11,8 @@
   },
   "browserslist": ">0.8%, not ie 11, not op_mini all, not dead",
   "dependencies": {
-    "@jupyter-widgets/base": "^6.0.6",
-    "@jupyter-widgets/jupyterlab-manager": "^5.0.9",
+    "@jupyter-widgets/base": "^6.0.10",
+    "@jupyter-widgets/jupyterlab-manager": "^5.0.13",
     "@jupyterlab/application": "^4.0.0",
     "@jupyterlab/apputils": "^4.0.0",
     "@jupyterlab/apputils-extension": "^4.0.0",

diff --git a/packages/voila/src/tools.ts b/packages/voila/src/tools.ts
@@ -90,7 +90,7 @@ export function shouldUseMathJax2() {
     PageConfig.setOption(
       urlParam,
       url === 'null'
-        ? 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/MathJax.js'
+        ? 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/3.2.2/es5/latest.min.js'
         : url
     );
     PageConfig.setOption(

diff --git a/pyproject.toml b/pyproject.toml
@@ -37,7 +37,7 @@ classifiers = [
 dependencies = [
     "jupyter_client>=7.4.4,<9",
     "jupyter_core>=4.11.0",
-    "jupyter_server>=2.0.0,<3",
+    "jupyter_server>=1.18,<3",
     "jupyterlab_server>=2.3.0,<3",
     "nbclient>=0.4.0",
     "nbconvert>=6.4.5,<8",

diff --git a/requirements-visual-test.txt b/requirements-visual-test.txt
@@ -1,4 +1,5 @@
 bokeh
+bokeh_sampledata
 bqplot
 ipympl==0.9.2
 jupyterlab~=4.0

diff --git a/ui-tests/package.json b/ui-tests/package.json
@@ -4,7 +4,7 @@
   "description": "Voila UI Tests",
   "private": true,
   "scripts": {
-    "start": "voila ../notebooks --no-browser --show_tracebacks True --Voila.mathjax_url=https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/MathJax.js",
+    "start": "voila ../notebooks --no-browser --show_tracebacks True",
     "start:detached": "yarn run start&",
     "test": "npx playwright test",
     "test:debug": "PWDEBUG=1 playwright test",

diff --git a/ui-tests/tests/voila.test.ts b/ui-tests/tests/voila.test.ts
@@ -83,7 +83,7 @@ test.describe('Voila performance Tests', () => {
     const testFunction = async () => {
       await page.goto(`/voila/render/${notebookName}.ipynb?template=classic`);
       // wait for the widgets to load
-      await page.waitForSelector('span[role="presentation"] >> text=x');
+      await page.waitForSelector('.slider-container');
     };
     await addBenchmarkToTest(notebookName, testFunction, testInfo, browserName);
 
@@ -103,7 +103,7 @@ test.describe('Voila performance Tests', () => {
     const testFunction = async () => {
       await page.goto(`/voila/render/${notebookName}.ipynb`);
       // wait for the widgets to load
-      await page.waitForSelector('span.mjx-char >> text=x');
+      await page.waitForSelector('.slider-container');
     };
     await addBenchmarkToTest(notebookName, testFunction, testInfo, browserName);
     // change the value of the slider
@@ -128,7 +128,7 @@ test.describe('Voila performance Tests', () => {
     const testFunction = async () => {
       await page.goto(`/voila/render/${notebookName}.ipynb?theme=dark`);
       // wait for the widgets to load
-      await page.waitForSelector('span[role="presentation"] >> text=x');
+      await page.waitForSelector('.slider-container');
     };
     await addBenchmarkToTest(notebookName, testFunction, testInfo, browserName);
 
@@ -148,7 +148,7 @@ test.describe('Voila performance Tests', () => {
         `/voila/render/${notebookName}.ipynb?theme=JupyterLab%20Miami%20Nights`
       );
       // wait for the widgets to load
-      await page.waitForSelector('span[role="presentation"] >> text=x');
+      await page.waitForSelector('.slider-container');
     };
     await addBenchmarkToTest(notebookName, testFunction, testInfo, browserName);
 
@@ -334,7 +334,7 @@ test.describe('Voila performance Tests', () => {
     const notebookName = 'reveal';
     const testFunction = async () => {
       await page.goto(`/voila/render/${notebookName}.ipynb`);
-      await page.waitForSelector('span[role="presentation"] >> text=x');
+      await page.waitForSelector('.slider-container');
     };
     await addBenchmarkToTest(notebookName, testFunction, testInfo, browserName);
     expect(await page.screenshot()).toMatchSnapshot(`${notebookName}.png`);