Skip to content

Commit 376c996

Browse files
authored
Merge pull request #1057 from krassowski/lab-41-cont
Build against JupyterLab 4.1, fix tests
2 parents 5afe3b4 + e8de5d1 commit 376c996

File tree

146 files changed

+5520
-4033
lines changed

Some content is hidden

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

146 files changed

+5520
-4033
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ https://jupyterlab.readthedocs.io/en/latest/getting_started/issue.html
4141

4242
<details><summary>Required: installed server extensions</summary>
4343
<pre>
44-
Paste the output from running `jupyter server extension list` (JupyterLab >= 3)
45-
or `jupyter serverextension list` (JupyterLab < 3) from the command line here.
44+
Paste the output from running `jupyter server extension list` from the command line here.
4645
You may want to sanitize the paths in the output.
4746
</pre>
4847
</details>

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
steps:
3030
- name: Checkout repository
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232

3333
# Initializes the CodeQL tools for scanning.
3434
- name: Initialize CodeQL

.github/workflows/job.test.yml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ jobs:
4343
strategy:
4444
matrix:
4545
os: [ubuntu]
46-
nodejs: ['>=16,<17.0.0a0']
47-
lab: ['>=4.0.6,<5.0.0a0']
46+
nodejs: ['>=20,<21']
47+
lab: ['>=4.1.0,<5.0.0a0']
4848
r: ['>=4']
4949
steps:
50-
- uses: actions/checkout@v3
50+
- uses: actions/checkout@v4
5151

5252
- uses: cschleiden/replace-tokens@v1
5353
with:
@@ -59,7 +59,7 @@ jobs:
5959
nodejs: '${{ matrix.nodejs }}'
6060

6161
- name: Set up Python and mamba
62-
uses: conda-incubator/setup-miniconda@v2
62+
uses: conda-incubator/setup-miniconda@v3
6363
with:
6464
environment-file: requirements/github-actions.yml
6565
miniforge-variant: Mambaforge
@@ -73,7 +73,7 @@ jobs:
7373

7474
- name: Cache node_modules
7575
id: cache-node-modules
76-
uses: actions/cache@v3
76+
uses: actions/cache@v4
7777
with:
7878
path: '**/node_modules'
7979
key: |
@@ -82,7 +82,7 @@ jobs:
8282
- name: Cache yarn packages
8383
id: cache-yarn-packages
8484
if: steps.cache-node-modules.outputs.cache-hit != 'true'
85-
uses: actions/cache@v3
85+
uses: actions/cache@v4
8686
with:
8787
path: '.yarn/cache'
8888
key: |
@@ -123,11 +123,11 @@ jobs:
123123
strategy:
124124
matrix:
125125
os: [ubuntu]
126-
nodejs: ['>=16,<17.0.0a0']
127-
lab: ['>=4.0.0,<5.0.0a0']
126+
nodejs: ['>=20,<21']
127+
lab: ['>=4.1.0,<5.0.0a0']
128128
r: ['>=4']
129129
steps:
130-
- uses: actions/checkout@v3
130+
- uses: actions/checkout@v4
131131

132132
- uses: cschleiden/replace-tokens@v1
133133
with:
@@ -139,7 +139,7 @@ jobs:
139139
nodejs: '${{ matrix.nodejs }}'
140140

141141
- name: Set up Python and mamba
142-
uses: conda-incubator/setup-miniconda@v2
142+
uses: conda-incubator/setup-miniconda@v3
143143
with:
144144
miniforge-variant: Mambaforge
145145
use-mamba: true
@@ -149,7 +149,7 @@ jobs:
149149

150150
- name: Cache node_modules
151151
id: cache-node-modules
152-
uses: actions/cache@v3
152+
uses: actions/cache@v4
153153
with:
154154
path: '**/node_modules'
155155
key: |
@@ -158,7 +158,7 @@ jobs:
158158
- name: Cache yarn packages
159159
id: cache-yarn-packages
160160
if: steps.cache-node-modules.outputs.cache-hit != 'true'
161-
uses: actions/cache@v3
161+
uses: actions/cache@v4
162162
with:
163163
path: '.yarn/cache'
164164
key: |
@@ -196,7 +196,7 @@ jobs:
196196
sha256sum * | tee SHA256SUMS
197197
198198
- name: Publish builds
199-
uses: actions/upload-artifact@v3
199+
uses: actions/upload-artifact@v4
200200
with:
201201
name: jupyterlab-lsp dist ${{ github.run_number }}
202202
path: ./dist
@@ -220,15 +220,15 @@ jobs:
220220
# Node 16 end-of-life: 2023-09-11
221221
nodejs: '>=16,<17.0.0.a0'
222222
r: '>=4'
223-
lab: '>=4,<5'
223+
lab: '>=4.1.0,<5'
224224
- python: '3.11'
225225
# Node 18 end-of-life: 2025-04-30
226226
nodejs: '>=18,<19.0.0.a0'
227227
r: '>=4'
228-
lab: '>=4,<5'
228+
lab: '>=4.1.0,<5'
229229

230230
steps:
231-
- uses: actions/checkout@v3
231+
- uses: actions/checkout@v4
232232

233233
- name: Set JupyterLab and Node versions
234234
uses: cschleiden/replace-tokens@v1
@@ -241,7 +241,7 @@ jobs:
241241
nodejs: '${{ matrix.nodejs }}'
242242

243243
- name: Set up Python and mamba
244-
uses: conda-incubator/setup-miniconda@v2
244+
uses: conda-incubator/setup-miniconda@v3
245245
with:
246246
python-version: ${{ matrix.python }}
247247
environment-file: requirements/github-actions.yml
@@ -253,7 +253,7 @@ jobs:
253253

254254
- name: Cache node_modules
255255
id: cache-node-modules
256-
uses: actions/cache@v3
256+
uses: actions/cache@v4
257257
with:
258258
path: '**/node_modules'
259259
key: |
@@ -262,7 +262,7 @@ jobs:
262262
- name: Cache yarn packages
263263
id: cache-yarn-packages
264264
if: steps.cache-node-modules.outputs.cache-hit != 'true'
265-
uses: actions/cache@v3
265+
uses: actions/cache@v4
266266
with:
267267
path: '.yarn/cache'
268268
key: |
@@ -271,13 +271,13 @@ jobs:
271271
${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-
272272
${{ env.CACHE_EPOCH }}-yarn-
273273
274-
- uses: actions/cache@v3
274+
- uses: actions/cache@v4
275275
with:
276276
path: ~/.julia/artifacts
277277
key: |
278278
${{ env.CACHE_EPOCH }}-julia-test-${{ runner.os }}-${{ env.JULIA_LANGSERVER }}
279279
280-
- uses: actions/download-artifact@v3
280+
- uses: actions/download-artifact@v4
281281
with:
282282
name: jupyterlab-lsp dist ${{ github.run_number }}
283283
path: ./dist
@@ -322,15 +322,15 @@ jobs:
322322

323323
- name: Find and remove empty files
324324
# https://github.com/actions/upload-artifact/issues/150
325-
run: find ./atest/output -empty -delete
325+
run: find ./build/reports -empty -delete
326326
if: always()
327327
shell: bash
328328

329329
- name: Publish browser test output
330-
uses: actions/upload-artifact@v3
330+
uses: actions/upload-artifact@v4
331331
with:
332-
name: ${{ job.status }} Robot ${{ matrix.os }} Python ${{ matrix.python }} ${{ github.run_number }}
333-
path: ./atest/output
332+
name: Robot ${{ matrix.os }} Python ${{ matrix.python }} ${{ github.run_number }}
333+
path: ./build/reports
334334
if: always()
335335

336336
- name: Rename uncached conda packages
@@ -350,16 +350,16 @@ jobs:
350350
include:
351351
- python: '3.8'
352352
dist: 'jupyter*lsp*.whl'
353-
lab: '>=4,<5'
353+
lab: '>=4.1.0,<5'
354354
- python: '3.8'
355355
dist: 'jupyter*lsp*.tar.gz'
356-
lab: '>=4,<5'
356+
lab: '>=4.1.0,<5'
357357
- python: '3.11'
358358
dist: 'jupyter*lsp*.whl'
359-
lab: '>=4,<5'
359+
lab: '>=4.1.0,<5'
360360
- python: 'pypy-3.8'
361361
dist: 'jupyter*lsp*.tar.gz'
362-
lab: '>=4,<5'
362+
lab: '>=4.1.0,<5'
363363
- os: 'windows'
364364
py_cmd: python
365365
- os: 'macos'
@@ -368,11 +368,11 @@ jobs:
368368
py_cmd: python
369369
steps:
370370
- name: Install Python
371-
uses: actions/setup-python@v4
371+
uses: actions/setup-python@v5
372372
with:
373373
python-version: ${{ matrix.python }}
374374
architecture: 'x64'
375-
- uses: actions/download-artifact@v3
375+
- uses: actions/download-artifact@v4
376376
with:
377377
name: jupyterlab-lsp dist ${{ github.run_number }}
378378
path: ./dist
@@ -402,23 +402,23 @@ jobs:
402402
matrix:
403403
os: [ubuntu]
404404
python: ['3.8', '3.11']
405-
nodejs: ['18']
405+
nodejs: ['20.x']
406406
include:
407407
- python: '3.8'
408-
lab: '>=4,<5'
408+
lab: '>=4.1.0,<5'
409409
- python: '3.11'
410-
lab: '>=4,<5'
410+
lab: '>=4.1.0,<5'
411411
steps:
412412
- name: Install Python
413-
uses: actions/setup-python@v4
413+
uses: actions/setup-python@v5
414414
with:
415415
python-version: ${{ matrix.python }}
416416
architecture: 'x64'
417417
- name: Setup Node
418418
uses: actions/setup-node@v3
419419
with:
420420
node-version: ${{ matrix.nodejs }}
421-
- uses: actions/download-artifact@v3
421+
- uses: actions/download-artifact@v4
422422
with:
423423
name: jupyterlab-lsp dist ${{ github.run_number }}
424424
path: ./dist

.gitignore

Lines changed: 9 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,18 @@
11
# Byte-compiled / optimized / DLL files
22
__pycache__/
3-
*.py[cod]
4-
*$py.class
5-
6-
# C extensions
7-
*.so
83

94
# Distribution / packaging
10-
.Python
115
build/
12-
develop-eggs/
136
dist/
14-
downloads/
15-
eggs/
16-
.eggs/
177
lib/
18-
lib64/
19-
parts/
20-
sdist/
21-
var/
22-
wheels/
238
*.egg-info/
24-
.installed.cfg
25-
*.egg
26-
MANIFEST
27-
28-
# PyInstaller
29-
# Usually these files are written by a python script from a template
30-
# before PyInstaller builds the exe, so as to inject date/other infos into it.
31-
*.manifest
32-
*.spec
33-
34-
# Installer logs
35-
pip-log.txt
36-
pip-delete-this-directory.txt
37-
38-
# Unit test / coverage reports
39-
htmlcov/
40-
.tox/
41-
.coverage
42-
.coverage.*
43-
.cache
44-
nosetests.xml
45-
coverage.xml
46-
*.cover
47-
.hypothesis/
48-
.pytest_cache/
49-
50-
# Translations
51-
*.mo
52-
*.pot
53-
54-
# Django stuff:
55-
*.log
56-
local_settings.py
57-
db.sqlite3
58-
59-
# Flask stuff:
60-
instance/
61-
.webassets-cache
62-
63-
# Scrapy stuff:
64-
.scrapy
659

6610
# Sphinx documentation
6711
docs/_build/
6812

69-
# PyBuilder
70-
target/
71-
72-
# Jupyter Notebook
73-
.ipynb_checkpoints
74-
75-
# pyenv
76-
.python-version
77-
78-
# celery beat schedule file
79-
celerybeat-schedule
80-
81-
# SageMath parsed files
82-
*.sage.py
13+
# Jupyter
14+
.ipynb_checkpoints/
15+
.virtual_documents/
8316

8417
# Environments
8518
.env
@@ -91,39 +24,16 @@ ENV/
9124
env.bak/
9225
venv.bak/
9326

94-
# Spyder project settings
95-
.spyderproject
96-
.spyproject
97-
98-
# Rope project settings
99-
.ropeproject
100-
101-
# mkdocs documentation
102-
/site
103-
104-
# mypy
105-
.mypy_cache/
106-
107-
node_modules
108-
.yarn-packages
27+
# nodejs
28+
node_modules/
10929
*.tsbuildinfo
11030
*.tgz
11131

112-
atest/output/
113-
.pabotsuitenames
114-
junit.xml
115-
coverage/
32+
# editors
11633
.vscode/
117-
_*.d.ts
118-
_*.ts
119-
_build
120-
.virtual_documents/
12134
.idea/
12235

123-
# Built labextensions
36+
# generated files
37+
_*.d.ts
38+
_*.ts
12439
python_packages/*/*/labextensions/
125-
126-
# Berry
127-
.pnp.cjs
128-
.pnp.loader.mjs
129-
.yarn/

0 commit comments

Comments
 (0)