Skip to content

Commit 9b12f42

Browse files
committed
slow down on lab startup, pin to lab 4.0.x for now
1 parent 7f3fa59 commit 9b12f42

File tree

9 files changed

+49
-31
lines changed

9 files changed

+49
-31
lines changed

.github/workflows/job.test.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ 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.0.12,<4.1.0a0']
4848
r: ['>=4']
4949
steps:
5050
- uses: actions/checkout@v4
@@ -123,7 +123,7 @@ jobs:
123123
strategy:
124124
matrix:
125125
os: [ubuntu]
126-
nodejs: ['>=16,<17.0.0a0']
126+
nodejs: ['>=20,<21']
127127
lab: ['>=4.0.0,<5.0.0a0']
128128
r: ['>=4']
129129
steps:
@@ -220,12 +220,12 @@ 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.0.12,<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.0.12,<5'
229229

230230
steps:
231231
- uses: actions/checkout@v4
@@ -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
330330
uses: actions/upload-artifact@v3
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.0.12,<5'
354354
- python: '3.8'
355355
dist: 'jupyter*lsp*.tar.gz'
356-
lab: '>=4,<5'
356+
lab: '>=4.0.12,<5'
357357
- python: '3.11'
358358
dist: 'jupyter*lsp*.whl'
359-
lab: '>=4,<5'
359+
lab: '>=4.0.12,<5'
360360
- python: 'pypy-3.8'
361361
dist: 'jupyter*lsp*.tar.gz'
362-
lab: '>=4,<5'
362+
lab: '>=4.0.12,<5'
363363
- os: 'windows'
364364
py_cmd: python
365365
- os: 'macos'
@@ -402,12 +402,12 @@ 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.0.12,<5'
409409
- python: '3.11'
410-
lab: '>=4,<5'
410+
lab: '>=4.0.12,<5'
411411
steps:
412412
- name: Install Python
413413
uses: actions/setup-python@v4

CONTRIBUTING.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Thank you for all your contributions :heart:
3232
A development environment requires, at a minimum:
3333

3434
- `python >=3.8,<3.13.0a0`
35-
- `jupyterlab >=4.0.10,<5.0.0a0`
35+
- `jupyterlab >=4.0.10,<4.1.0a0`
3636
- `nodejs >=18,!=19,!=21,<23`
3737

3838
It is recommended to use a virtual environment (e.g. `virtualenv` or `conda env`)
@@ -228,17 +228,19 @@ Run the tests:
228228
python scripts/atest.py
229229
```
230230

231-
The Robot Framework reports and screenshots will be in `atest/output`, with
232-
`<operating system>_<python version>_<attempt>.<log|report>.html` and subsequent `screenshots` being the most interesting
233-
artifact, e.g.
231+
The Robot Framework reports and screenshots will be in
232+
`build/reports/{os}_{py}/atest/{attempt}`, with `(log|report).html` and subsequent
233+
captured `screenshots` being the most interesting artifact, e.g.
234234

235235
```
236-
atest/
237-
output/
238-
linux_37_1.log.html
239-
linux_37_1.report.html
240-
linux_37_1/
241-
screenshots/
236+
build/
237+
reports/
238+
linux_310/
239+
atest/
240+
1/
241+
log.html
242+
report.html
243+
screenshots/
242244
```
243245

244246
#### Customizing the Acceptance Test Run

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Use context menu on rows in the panel to filter out diagnostics or copy their me
9090

9191
You will need to have both of the following installed:
9292

93-
- JupyterLab >=4.0.6,<5.0.0a0
93+
- JupyterLab >=4.0.12,<4.1.0a0
9494
- Python 3.8+
9595

9696
In addition, if you wish to use javascript, html, markdown or any other NodeJS-based language server you will need to have appropriate NodeJS version installed.

atest/_libraries/logcheck.py

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from bs4 import UnicodeDammit
2-
2+
import time
33

44
def file_should_not_contain_phrases(filename, offset=0, *phrases):
55
"""don't fail _too_ hard if the file can't be read for some reason"""
@@ -26,3 +26,17 @@ def file_should_not_contain_phrases(filename, offset=0, *phrases):
2626
matches[phrase] = True
2727

2828
assert not matches, "Phrases found in {}: {}".format(filename, matches)
29+
30+
31+
def wait_until_file_contains(filename, *phrases, retries: int=20, interval: float=0.5):
32+
for i in range(retries):
33+
try:
34+
file_should_not_contain_phrases(filename, 0, *phrases)
35+
time.sleep(interval)
36+
except AssertionError as err:
37+
print(err)
38+
return True
39+
40+
raise RuntimeError(
41+
f"After {retries*interval}s, {filename} did not contain: {phrases}"
42+
)

atest/_resources/Keywords.resource

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ Setup Server and Browser
3535
... env:HOME=${HOME}
3636
... env:JUPYTER_NO_CONFIG=${EMPTY}
3737
Set Global Variable ${SERVER} ${server}
38+
Wait Until File Contains ${LAB LOG}
39+
... The following Language Servers will be available
3840
Open JupyterLab
3941
Read Page Config
4042

binder/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ channels:
77
dependencies:
88
# runtime dependencies
99
- python >=3.8,<3.13.0a0
10-
- jupyterlab >=4.0.10,<5.0.0a0
10+
- jupyterlab >=4.0.10,<4.1.0a0
1111
- jupyter_server >=1.1.2
1212
- notebook >=7
1313
# build dependencies

docs/rtd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ channels:
77

88
dependencies:
99
- importlib_metadata
10-
- jupyterlab >=4.0.6,<5.0.0a0
10+
- jupyterlab >=4.0.10,<4.1.0a0
1111
- myst-nb
1212
- nodejs >=18,!=19,!=21,<23
1313
- pandas

python_packages/jupyterlab_lsp/setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ python_requires = >=3.8
3737

3838
install_requires =
3939
jupyter_lsp >=2.0.0
40-
jupyterlab >=4.0.6,<5.0.0a0
40+
jupyterlab >=4.0.10,<4.1.0a0

requirements/lab.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# the version of jupyterlab
22
-r ./prod.txt
3-
jupyterlab >=4.0.6,<5.0.0a0
3+
jupyterlab >=4.0.10,<4.1.0a0

0 commit comments

Comments
 (0)