Skip to content

Commit 3ab85b7

Browse files
committed
Merge branch 'master' into mathjax3-redo
2 parents 048c591 + f73680f commit 3ab85b7

File tree

395 files changed

+6782
-8392
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

395 files changed

+6782
-8392
lines changed

.bumpversion.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 4, 0, 0, "alpha", 33
2+
current_version = 4, 0, 0, "alpha", 34
33
commit = False
44
tag = False
55
parse = (?P<major>\d+)\,\ (?P<minor>\d+)\,\ (?P<patch>\d+)\,\ \"(?P<release>\S+)\"\,\ (?P<build>\d+)

.github/labeler.yml

-16
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,6 @@ pkg:codeeditor:
6666
- packages/codeeditor/**/*
6767
- packages/codeeditor/*
6868

69-
pkg:collaboration:
70-
- packages/collaboration/**/*
71-
- packages/collaboration/*
72-
- packages/collaboration-extension/**/*
73-
- packages/collaboration-extension/*
74-
7569
pkg:codemirror:
7670
- packages/codemirror/**/*
7771
- packages/codemirror/*
@@ -112,10 +106,6 @@ pkg:docmanager:
112106
- packages/docmanager-extension/**/*
113107
- packages/docmanager-extension/*
114108

115-
pkg:docprovider:
116-
- packages/docprovider/**/*
117-
- packages/docprovider/*
118-
119109
pkg:docregistry:
120110
- packages/docregistry/**/*
121111
- packages/docregistry/*
@@ -312,12 +302,6 @@ pkg:ui-components:
312302
- packages/ui-components-extension/**/*
313303
- packages/ui-components-extension/*
314304

315-
pkg:vdom:
316-
- packages/vdom/**/*
317-
- packages/vdom/*
318-
- packages/vdom-extension/**/*
319-
- packages/vdom-extension/*
320-
321305
pkg:vega:
322306
- packages/vega5-extension/**/*
323307
- packages/vega5-extension/*

.github/workflows/benchmark-report.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ permissions:
2222
jobs:
2323
upload:
2424
runs-on: ubuntu-latest
25-
if: github.event.workflow_run.conclusion == 'success'
25+
# Carry action even on failure (happening if memory leak tests fail for example)
26+
if: github.event.workflow_run.conclusion == 'success' || github.event.workflow_run.conclusion == 'failure'
2627
steps:
2728
- name: 'Download artifact'
2829
uses: actions/github-script@v6

.github/workflows/benchmark.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Execute benchmark tests
1111
if: github.event_name == 'schedule' || (github.event_name == 'pull_request_review' && (github.event.review.state == 'approved' || contains(github.event.review.body, 'please run benchmark')))
1212

13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-22.04
1414

1515
env:
1616
BENCHMARK_NUMBER_SAMPLES: 100
@@ -207,7 +207,7 @@ jobs:
207207
name: Execute memory-leak tests
208208
if: github.event_name == 'schedule' || (github.event_name == 'pull_request_review' && (github.event.review.state == 'approved' || contains(github.event.review.body, 'please run benchmark')))
209209

210-
runs-on: ubuntu-20.04
210+
runs-on: ubuntu-22.04
211211
timeout-minutes: 30
212212

213213
steps:
@@ -241,7 +241,7 @@ jobs:
241241

242242
- name: Execute memory leak tests
243243
id: memory_leaks
244-
uses: jupyterlab/benchmarks/.github/actions/memory-leak@v1.2.2
244+
uses: jupyterlab/benchmarks/.github/actions/memory-leak@v1
245245
with:
246246
server_url: localhost:8888
247247
artifacts_name: benchmark-assets

.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ permissions:
2121
jobs:
2222
analyze:
2323
name: Analyze
24-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-latest
2525

2626
strategy:
2727
fail-fast: false

.github/workflows/galata-update.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
update-galata-snapshots:
1313
name: Update Galata References
1414
if: ${{ github.event.issue.pull_request && (contains(github.event.comment.body, 'please update galata snapshots') || contains(github.event.comment.body, 'please update snapshots')) }}
15-
timeout-minutes: 80
16-
runs-on: ubuntu-20.04
15+
timeout-minutes: 120
16+
runs-on: ubuntu-22.04
1717

1818
steps:
1919
- name: Checkout
@@ -53,16 +53,16 @@ jobs:
5353
update-documentation-snapshots:
5454
name: Update Documentation Snapshots
5555
if: ${{ github.event.issue.pull_request && (contains(github.event.comment.body, 'please update documentation snapshots') || contains(github.event.comment.body, 'please update snapshots')) }}
56-
timeout-minutes: 80
57-
runs-on: ubuntu-20.04
56+
timeout-minutes: 120
57+
runs-on: ubuntu-22.04
5858

5959
# Python version is frozen through strategy.matrix.python-version
6060
# Python dependencies are frozen in the installation step
6161
# Note: IPython is among the frozen package
6262
strategy:
6363
matrix:
6464
# Freeze Python version because it appears in console header
65-
python-version: ['3.9.9']
65+
python-version: ['3.10.6']
6666

6767
steps:
6868
- name: Checkout JupyterLab

.github/workflows/galata.yml

+21-4
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,29 @@ on:
88
- master
99
pull_request:
1010

11+
env:
12+
PLAYWRIGHT_BROWSERS_PATH: ${{ github.workspace }}/pw-browsers
13+
1114
jobs:
1215
test:
1316
name: Visual Regression Tests
1417
if: ${{ (github.event_name != 'issue_comment') || (github.event.issue.pull_request && (contains(github.event.comment.body, 'Galata snapshots updated.'))) }}
1518
timeout-minutes: 80
16-
runs-on: ubuntu-20.04
19+
runs-on: ubuntu-22.04
1720
steps:
1821
- name: Checkout
1922
uses: actions/checkout@v3
2023

2124
- name: Base Setup
2225
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
2326

27+
- name: Set up browser cache
28+
uses: actions/cache@v3
29+
with:
30+
path: |
31+
${{ github.workspace }}/pw-browsers
32+
key: ${{ runner.os }}-${{ hashFiles('ui-tests/yarn.lock') }}
33+
2434
- name: Install dependencies
2535
run: |
2636
bash ./scripts/ci_install.sh
@@ -48,7 +58,7 @@ jobs:
4858
- name: Test
4959
run: |
5060
cd galata
51-
jlpm run test
61+
jlpm run test --project galata jupyterlab
5262
mv galata/test-results galata/test-jupyterlab-results || true
5363
# Run once benchmark tests to ensure they have no regression
5464
BENCHMARK_NUMBER_SAMPLES=1 jlpm run test:benchmark
@@ -82,11 +92,11 @@ jobs:
8292
# Python dependencies are frozen in the installation step
8393
# Note: IPython is among the frozen package
8494
timeout-minutes: 80
85-
runs-on: ubuntu-20.04
95+
runs-on: ubuntu-22.04
8696
strategy:
8797
matrix:
8898
# Freeze Python version because it appears in console header
89-
python-version: ['3.9.9']
99+
python-version: ['3.10.6']
90100
steps:
91101
- name: Checkout JupyterLab
92102
uses: actions/checkout@v3
@@ -108,6 +118,13 @@ jobs:
108118
- name: Base Setup
109119
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
110120

121+
- name: Set up browser cache
122+
uses: actions/cache@v3
123+
with:
124+
path: |
125+
${{ github.workspace }}/pw-browsers
126+
key: ${{ runner.os }}-${{ hashFiles('ui-tests/yarn.lock') }}
127+
111128
- name: Install dependencies
112129
run: |
113130
set -ex

.github/workflows/license-header.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
header-license-fix:
8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-latest
99

1010
permissions:
1111
contents: write

.github/workflows/linuxjs-tests.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ jobs:
1313
name: JS
1414
strategy:
1515
matrix:
16+
# Fix for https://github.com/jupyterlab/jupyterlab/issues/13903
17+
include:
18+
- group: js-debugger
19+
python-version: '3.11'
1620
group:
1721
[
1822
js-application,
@@ -27,7 +31,6 @@ jobs:
2731
js-csvviewer,
2832
js-debugger,
2933
js-docmanager,
30-
js-docprovider,
3134
js-docregistry,
3235
js-documentsearch,
3336
js-filebrowser,
@@ -56,7 +59,7 @@ jobs:
5659
js-vega5-extension,
5760
]
5861
fail-fast: false
59-
runs-on: ubuntu-20.04
62+
runs-on: ubuntu-22.04
6063
timeout-minutes: 40
6164
steps:
6265
- name: Checkout

.github/workflows/linuxtests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
python-version: "3.8"
4747
fail-fast: false
4848
timeout-minutes: 45
49-
runs-on: ubuntu-20.04
49+
runs-on: ubuntu-22.04
5050
steps:
5151
- name: Checkout
5252
uses: actions/checkout@v3

.github/workflows/lock.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212

1313
jobs:
1414
lock:
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-latest
1616
steps:
1717
- uses: dessant/lock-threads@v4
1818
with:

.github/workflows/reject-staging-changes.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
- name: Get modified files in the staging directory
1818
id: modified-files-in-staging
19-
uses: tj-actions/changed-files@v35.4.4
19+
uses: tj-actions/changed-files@v35.5.2
2020
with:
2121
# only checks for modified files in this directory
2222
files: jupyterlab/staging

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ examples/federated/labextensions
2323

2424
junit.xml
2525

26+
jupyterlab/galata/@jupyterlab
2627
jupyterlab/geckodriver
2728
jupyterlab/static
2829
jupyterlab/schemas

.pre-commit-config.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ repos:
2525
exclude: .bumpversion.cfg
2626

2727
- repo: https://github.com/python-jsonschema/check-jsonschema
28-
rev: 0.20.0
28+
rev: 0.21.0
2929
hooks:
3030
- id: check-github-workflows
3131

3232
- repo: https://github.com/psf/black
33-
rev: 22.12.0
33+
rev: 23.1.0
3434
hooks:
3535
- id: black
3636

3737
- repo: https://github.com/charliermarsh/ruff-pre-commit
38-
rev: v0.0.230
38+
rev: v0.0.246
3939
hooks:
4040
- id: ruff
4141
args: ["--fix"]

.prettierignore

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ examples/federated/core_package/index.template.js
2424
examples/federated/core_package/index.js
2525
examples/federated/labextensions
2626
galata/playwright-report
27+
jupyterlab/galata
2728
jupyterlab/schemas
2829
jupyterlab/themes
2930
jupyterlab/geckodriver

0 commit comments

Comments
 (0)