Skip to content

Commit d4fd39d

Browse files
committed
Merge branch 'master' into interface/diagnostics_panel/fix-caret-icons
2 parents 507d68c + 6101ccd commit d4fd39d

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

ci/env-test.yml.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ dependencies:
3030
- firefox
3131
- geckodriver
3232
- robotframework-seleniumlibrary
33+
- robotframework <3.2

ci/job.lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ jobs:
3434
- script: ${{ platform.activate }} jupyterlab-lsp && python scripts/integrity.py
3535
displayName: check integrity of package versions
3636

37-
- script: ${{ platform.activate }} jupyterlab-lsp && python scripts/lint.py
38-
displayName: lint backend
39-
4037
- script: ${{ platform.activate }} jupyterlab-lsp && jlpm || jlpm || jlpm
4138
displayName: install npm dependencies
4239

40+
- script: ${{ platform.activate }} jupyterlab-lsp && python scripts/lint.py
41+
displayName: lint backend
42+
4343
- script: ${{ platform.activate }} jupyterlab-lsp && jlpm build:schema
4444
displayName: build schema so linting can complete
4545

requirements/atest.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# acceptance test dependencies for jupyter_lsp
22
-r ./lab.txt
33
robotframework-seleniumlibrary
4+
robotframework <3.2

requirements/atest.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ channels:
66

77
dependencies:
88
- robotframework-seleniumlibrary
9+
- robotframework <3.2
910
- firefox
1011
- geckodriver

requirements/lint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ dependencies:
99
- isort
1010
- mypy
1111
- robotframework-lint
12+
- robotframework <3.2

0 commit comments

Comments
 (0)