Skip to content

Commit c019eb2

Browse files
krassowskikrassowski
authored
Merge branch 'master' into tcp_mode
2 parents bdbc4ac + 389cc50 commit c019eb2

File tree

135 files changed

+21195
-7012
lines changed

Some content is hidden

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

135 files changed

+21195
-7012
lines changed

‎.github/.condarc‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎.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@v2
31+
uses: actions/checkout@v3
3232

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

‎.github/workflows/job.test.yml‎

Lines changed: 48 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ jobs:
4444
matrix:
4545
os: [ubuntu]
4646
nodejs: ['>=14,<15.0.0a0']
47-
lab: ['>=3.1.0,<4.0.0a0']
47+
lab: ['>=3.3.0,<4.0.0a0']
4848
r: ['>=4']
4949
steps:
50-
- uses: actions/checkout@v2
50+
- uses: actions/checkout@v3
5151

5252
- uses: cschleiden/replace-tokens@v1
5353
with:
@@ -58,15 +58,6 @@ jobs:
5858
lab: '${{ matrix.lab }}'
5959
nodejs: '${{ matrix.nodejs }}'
6060

61-
- name: Cache conda
62-
uses: actions/cache@v2
63-
with:
64-
path: ~/conda_pkgs_dir
65-
key: |
66-
${{ env.CACHE_EPOCH }}-${{ matrix.os }}-lint-${{ hashFiles('requirements/github-actions.yml', 'requirements/lint.yml') }}
67-
restore-keys: |
68-
${{ env.CACHE_EPOCH }}-${{ matrix.os }}-lint-
69-
7061
- name: Set up Python and mamba
7162
uses: conda-incubator/setup-miniconda@v2
7263
with:
@@ -82,7 +73,7 @@ jobs:
8273

8374
- name: Cache node_modules
8475
id: cache-node-modules
85-
uses: actions/cache@v2
76+
uses: actions/cache@v3
8677
with:
8778
path: '**/node_modules'
8879
key: |
@@ -91,7 +82,7 @@ jobs:
9182
- name: Cache yarn packages
9283
id: cache-yarn-packages
9384
if: steps.cache-node-modules.outputs.cache-hit != 'true'
94-
uses: actions/cache@v2
85+
uses: actions/cache@v3
9586
with:
9687
path: .yarn-packages
9788
key: |
@@ -122,6 +113,10 @@ jobs:
122113
- name: Check distributions
123114
run: python scripts/distcheck.py
124115

116+
- name: Rename uncached conda packages
117+
shell: bash
118+
run: mv "${CONDA_PKGS_DIR}" "${CONDA_PKGS_DIR}_do_not_cache"
119+
125120
build:
126121
name: build
127122
runs-on: ${{ matrix.os }}-latest
@@ -132,7 +127,7 @@ jobs:
132127
lab: ['>=3.1.0,<4.0.0a0']
133128
r: ['>=4']
134129
steps:
135-
- uses: actions/checkout@v2
130+
- uses: actions/checkout@v3
136131

137132
- uses: cschleiden/replace-tokens@v1
138133
with:
@@ -143,27 +138,18 @@ jobs:
143138
lab: '${{ matrix.lab }}'
144139
nodejs: '${{ matrix.nodejs }}'
145140

146-
- name: Cache conda
147-
uses: actions/cache@v2
148-
with:
149-
path: ~/conda_pkgs_dir
150-
key: |
151-
${{ env.CACHE_EPOCH }}-${{ matrix.os }}-build-${{ hashFiles('requirements/github-actions.yml') }}
152-
restore-keys: |
153-
${{ env.CACHE_EPOCH }}-${{ matrix.os }}-build-
154-
155141
- name: Set up Python and mamba
156142
uses: conda-incubator/setup-miniconda@v2
157143
with:
158144
miniforge-variant: Mambaforge
145+
use-mamba: true
159146

160147
- name: Install minimal build deps
161-
shell: bash -l {0}
162148
run: mamba install -n test -c conda-forge setuptools wheel 'jupyterlab${{ matrix.lab }}' 'nodejs${{ matrix.nodejs }}'
163149

164150
- name: Cache node_modules
165151
id: cache-node-modules
166-
uses: actions/cache@v2
152+
uses: actions/cache@v3
167153
with:
168154
path: '**/node_modules'
169155
key: |
@@ -172,7 +158,7 @@ jobs:
172158
- name: Cache yarn packages
173159
id: cache-yarn-packages
174160
if: steps.cache-node-modules.outputs.cache-hit != 'true'
175-
uses: actions/cache@v2
161+
uses: actions/cache@v3
176162
with:
177163
path: .yarn-packages
178164
key: |
@@ -210,11 +196,15 @@ jobs:
210196
sha256sum * | tee SHA256SUMS
211197
212198
- name: Publish builds
213-
uses: actions/upload-artifact@v2
199+
uses: actions/upload-artifact@v3
214200
with:
215201
name: jupyterlab-lsp dist ${{ github.run_number }}
216202
path: ./dist
217203

204+
- name: Rename uncached conda packages
205+
shell: bash
206+
run: mv "${CONDA_PKGS_DIR}" "${CONDA_PKGS_DIR}_do_not_cache"
207+
218208
acceptance:
219209
runs-on: ${{ matrix.os }}-latest
220210
name: atest ${{ matrix.os }} py${{ matrix.python }} r${{ matrix.r }}
@@ -231,15 +221,15 @@ jobs:
231221
# Node 14 end-of-life: April 2023
232222
nodejs: '>=14,<15.0.0.a0'
233223
r: '<4'
234-
lab: '>=3.1.0,<3.2'
224+
lab: '>=3.3.0,<3.4'
235225
- python: '3.10'
236226
# Node 16 end-of-life: April 2024
237227
nodejs: '>=16,<17.0.0.a0'
238228
r: '>=4'
239-
lab: '>=3.2.0,<4'
229+
lab: '>=3.4.0,<4'
240230

241231
steps:
242-
- uses: actions/checkout@v2
232+
- uses: actions/checkout@v3
243233

244234
- name: Set JupyterLab and Node versions
245235
uses: cschleiden/replace-tokens@v1
@@ -251,15 +241,6 @@ jobs:
251241
lab: '${{ matrix.lab }}'
252242
nodejs: '${{ matrix.nodejs }}'
253243

254-
- name: Cache conda
255-
uses: actions/cache@v2
256-
with:
257-
path: ~/conda_pkgs_dir
258-
key: |
259-
${{ env.CACHE_EPOCH }}-${{ matrix.os }}-${{ matrix.python }}-atest-${{ hashFiles('requirements/github-actions.yml') }}
260-
restore-keys: |
261-
${{ env.CACHE_EPOCH }}-${{ matrix.os }}-${{ matrix.python }}-atest-
262-
263244
- name: Set up Python and mamba
264245
uses: conda-incubator/setup-miniconda@v2
265246
with:
@@ -273,7 +254,7 @@ jobs:
273254

274255
- name: Cache node_modules
275256
id: cache-node-modules
276-
uses: actions/cache@v2
257+
uses: actions/cache@v3
277258
with:
278259
path: '**/node_modules'
279260
key: |
@@ -282,7 +263,7 @@ jobs:
282263
- name: Cache yarn packages
283264
id: cache-yarn-packages
284265
if: steps.cache-node-modules.outputs.cache-hit != 'true'
285-
uses: actions/cache@v2
266+
uses: actions/cache@v3
286267
with:
287268
path: .yarn-packages
288269
key: |
@@ -291,13 +272,13 @@ jobs:
291272
${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-
292273
${{ env.CACHE_EPOCH }}-yarn-
293274
294-
- uses: actions/cache@v2
275+
- uses: actions/cache@v3
295276
with:
296277
path: ~/.julia/artifacts
297278
key: |
298279
${{ env.CACHE_EPOCH }}-julia-test-${{ runner.os }}-${{ env.JULIA_LANGSERVER }}
299280
300-
- uses: actions/download-artifact@v2
281+
- uses: actions/download-artifact@v3
301282
with:
302283
name: jupyterlab-lsp dist ${{ github.run_number }}
303284
path: ./dist
@@ -352,12 +333,16 @@ jobs:
352333
shell: bash
353334

354335
- name: Publish browser test output
355-
uses: actions/upload-artifact@v2
336+
uses: actions/upload-artifact@v3
356337
with:
357338
name: ${{ job.status }} Robot ${{ matrix.os }} Python ${{ matrix.python }} ${{ github.run_number }}
358339
path: ./atest/output
359340
if: always()
360341

342+
- name: Rename uncached conda packages
343+
shell: bash
344+
run: mv "${CONDA_PKGS_DIR}" "${CONDA_PKGS_DIR}_do_not_cache"
345+
361346
smoke:
362347
name: smoke ${{ matrix.os }} py${{ matrix.python }}
363348
runs-on: ${{ matrix.os }}-latest
@@ -374,19 +359,19 @@ jobs:
374359
include:
375360
- python: '3.7'
376361
dist: 'jupyter*lsp*.tar.gz'
377-
lab: '>=3.1,<3.2'
362+
lab: '>=3.3,<3.4'
378363
- python: '3.8'
379364
dist: 'jupyter*lsp*.whl'
380-
lab: '>=3.1,<3.2'
365+
lab: '>=3.3,<3.4'
381366
- python: '3.9'
382367
dist: 'jupyter*lsp*.tar.gz'
383-
lab: '>=3.2,<3.3'
368+
lab: '>=3.4,<4'
384369
- python: '3.10'
385370
dist: 'jupyter*lsp*.whl'
386-
lab: '>=3.2,<4'
371+
lab: '>=3.4,<4'
387372
- python: 'pypy-3.7'
388373
dist: 'jupyter*lsp*.tar.gz'
389-
lab: '>=3.2,<3.3'
374+
lab: '>=3.4,<4'
390375
- os: 'windows'
391376
py_cmd: python
392377
- os: 'macos'
@@ -395,11 +380,11 @@ jobs:
395380
py_cmd: python
396381
steps:
397382
- name: Install Python
398-
uses: actions/setup-python@v2
383+
uses: actions/setup-python@v4
399384
with:
400385
python-version: ${{ matrix.python }}
401386
architecture: 'x64'
402-
- uses: actions/download-artifact@v2
387+
- uses: actions/download-artifact@v3
403388
with:
404389
name: jupyterlab-lsp dist ${{ github.run_number }}
405390
path: ./dist
@@ -415,10 +400,10 @@ jobs:
415400
- name: Validate the install
416401
run: |
417402
set -eux
418-
jupyter labextension list
419-
jupyter server extension list
420-
jupyter labextension list 2>&1 | grep -ie "jupyterlab-lsp.*enabled.*ok" -
421-
jupyter server extension list 2>&1 | grep -ie "jupyter_lsp.*enabled" -
403+
${{ matrix.py_cmd }} -m jupyter labextension list
404+
${{ matrix.py_cmd }} -m jupyter server extension list
405+
${{ matrix.py_cmd }} -m jupyter labextension list 2>&1 | grep -ie "jupyterlab-lsp.*enabled.*ok" -
406+
${{ matrix.py_cmd }} -m jupyter server extension list 2>&1 | grep -ie "jupyter_lsp.*enabled" -
422407
423408
source:
424409
name: smoke source install ${{ matrix.os }} py${{ matrix.python }} lab${{ matrix.lab }}
@@ -432,32 +417,33 @@ jobs:
432417
nodejs: ['14']
433418
include:
434419
- python: '3.7'
435-
lab: '>=3.1,<3.2'
420+
lab: '>=3.3,<3.4'
436421
- python: '3.10'
437-
lab: '>=3.2,<4'
422+
lab: '>=3.3,<4'
438423
steps:
439424
- name: Install Python
440-
uses: actions/setup-python@v2
425+
uses: actions/setup-python@v4
441426
with:
442427
python-version: ${{ matrix.python }}
443428
architecture: 'x64'
444429
- name: Setup Node
445-
uses: actions/setup-node@v2
430+
uses: actions/setup-node@v3
446431
with:
447432
node-version: ${{ matrix.nodejs }}
448-
- uses: actions/download-artifact@v2
433+
- uses: actions/download-artifact@v3
449434
with:
450435
name: jupyterlab-lsp dist ${{ github.run_number }}
451436
path: ./dist
452437
- name: Install the prerequisites
453438
run: python -m pip install --upgrade pip wheel setuptools
454439
- name: Install JupyterLab
455-
shell: bash -l {0}
456440
run: python -m pip install 'jupyterlab${{ matrix.lab }}'
441+
- name: Install Notebook (to test serverextension)
442+
run: python -m pip install 'notebook'
457443
- name: Install the server package
458444
run: cd dist && python -m pip install -vv jupyter_lsp*.whl
459445
- name: install the source extension
460-
run: cd dist && jupyter labextension install krassowski-jupyterlab-lsp-*.tgz --log-level DEBUG
446+
run: cd dist && jupyter labextension install jupyter-lsp-jupyterlab-lsp-*.tgz --log-level DEBUG
461447
- name: Validate the install
462448
run: |
463449
set -eux

0 commit comments

Comments
 (0)