Skip to content

Commit 73c4ee3

Browse files
martinRenoumartinRenou
authored
Merge pull request #1 from karlaspuldaro/kspuldaro-lab3
Docs and dependencies version update
2 parents df6bac2 + eba0e53 commit 73c4ee3

File tree

8 files changed

+362
-329
lines changed

8 files changed

+362
-329
lines changed

‎CONTRIBUTING.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ You can contribute to the project through:
2929

3030
Development requires:
3131

32-
- `nodejs` 10+
33-
- `python` 3.5+
34-
- `jupyterlab` 2
32+
- `nodejs >=12,<15`
33+
- `python python >=3.6,<3.9.0a0`
34+
- `jupyterlab >=3.0.0rc10,<4.0.0a0`
3535

3636
It is recommended to use a virtual environment (e.g. `virtualenv` or `conda env`)
3737
for development.
3838

3939
```bash
40-
conda env update -n jupyterlab-lsp # create a conda env
41-
source activate jupyterlab-lsp # activate it
40+
conda env update -n jupyterlab-lsp --file binder/environment.yml # create a conda env
41+
source activate jupyterlab-lsp # activate it
4242
# or...
4343
pip install -r requirements/dev.txt # in a virtualenv, probably
4444
# ... and install nodejs, somehow
@@ -59,7 +59,7 @@ This performs all of the basic setup steps, and is used for the binder demo.
5959
Install `jupyter-lsp` from source in your virtual environment:
6060

6161
```bash
62-
python -m pip install -e .
62+
python -m pip install -e . --ignore-installed --no-deps -vv
6363
```
6464

6565
Enable the server extension:
@@ -72,9 +72,8 @@ Install `npm` dependencies, build TypeScript packages, and link
7272
to JupyterLab for development:
7373

7474
```bash
75-
jlpm
76-
jlpm build
77-
jlpm lab:link
75+
jlpm bootstrap
76+
pip install .
7877
```
7978

8079
### Frontend Development

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Use context menu on rows in the panel to filter out diagnostics or copy their me
7777

7878
You will need to have all of the following installed:
7979

80-
- JupyterLab >=2.2.0,<3.0.0a0
80+
- JupyterLab >=3.0.0rc10,<4.0.0a0
8181
- Python 3.5+
8282
- nodejs 10+
8383

@@ -97,9 +97,9 @@ Use of a python `virtualenv` or a conda env is also recommended.
9797
1. install JupyterLab and the server extension
9898

9999
```bash
100-
conda install -c conda-forge 'jupyterlab>=3.0.0-rc.7,<4.0.0a0' jupyter-lsp
100+
conda install -c conda-forge 'jupyterlab>=3.0.0-rc.10,<4.0.0a0' jupyter-lsp
101101
# or
102-
pip install 'jupyterlab>=3.0.0-rc.7,<4.0.0a0' jupyter-lsp
102+
pip install 'jupyterlab>=3.0.0-rc.10,<4.0.0a0' jupyter-lsp
103103
```
104104

105105
> Note: With conda, you could take advantage of the bundles: `jupyter-lsp-python`

‎binder/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ channels:
99
dependencies:
1010
# runtime dependencies
1111
- python >=3.7,<3.8.0a0
12-
- jupyterlab >=3.0.0rc8,<4.0.0a0
12+
- jupyterlab >=3.0.0rc10,<4.0.0a0
1313
- notebook >=4.3.1
1414
# build dependencies
1515
- nodejs >=10,<14

‎packages/completion-theme/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
},
3535
"devDependencies": {
3636
"@jupyterlab/builder": "^3.0.0-rc.2",
37-
"@jupyterlab/ui-components": "^3.0.0-rc.7",
37+
"@jupyterlab/ui-components": "^3.0.0-rc.10",
3838
"react": "^17.0.1",
3939
"rimraf": "^3.0.2",
4040
"typescript": "~4.0.3"
@@ -45,4 +45,4 @@
4545
"schemaDir": "schema",
4646
"outputDir": "../../py_src/jupyter_lsp/labextensions/@krassowski/completion-theme"
4747
}
48-
}
48+
}

‎packages/jupyterlab-go-to-definition/package.json

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,35 +30,35 @@
3030
"test": "jlpm jest --coverage --coverageReporters=cobertura --coverageReporters=html --coverageReporters=text-summary"
3131
},
3232
"peerDependencies": {
33-
"@jupyterlab/application": "^3.0.0-rc.7",
34-
"@jupyterlab/apputils": "^3.0.0-rc.7",
35-
"@jupyterlab/codeeditor": "^3.0.0-rc.7",
36-
"@jupyterlab/codemirror": "^3.0.0-rc.7",
37-
"@jupyterlab/coreutils": "^5.0.0-rc.7",
38-
"@jupyterlab/docmanager": "^3.0.0-rc.7",
39-
"@jupyterlab/docregistry": "^3.0.0-rc.7",
40-
"@jupyterlab/fileeditor": "^3.0.0-rc.7",
41-
"@jupyterlab/notebook": "^3.0.0-rc.7",
42-
"@jupyterlab/observables": "^4.0.0-rc.7",
43-
"@jupyterlab/services": "^6.0.0-rc.7",
33+
"@jupyterlab/application": "^3.0.0-rc.10",
34+
"@jupyterlab/apputils": "^3.0.0-rc.10",
35+
"@jupyterlab/codeeditor": "^3.0.0-rc.10",
36+
"@jupyterlab/codemirror": "^3.0.0-rc.10",
37+
"@jupyterlab/coreutils": "^5.0.0-rc.10",
38+
"@jupyterlab/docmanager": "^3.0.0-rc.10",
39+
"@jupyterlab/docregistry": "^3.0.0-rc.10",
40+
"@jupyterlab/fileeditor": "^3.0.0-rc.10",
41+
"@jupyterlab/notebook": "^3.0.0-rc.10",
42+
"@jupyterlab/observables": "^4.0.0-rc.10",
43+
"@jupyterlab/services": "^6.0.0-rc.10",
4444
"@lumino/algorithm": "*",
4545
"codemirror": "*",
4646
"react": "*"
4747
},
4848
"devDependencies": {
4949
"@babel/preset-env": "^7.4.3",
50-
"@jupyterlab/application": "^3.0.0-rc.7",
51-
"@jupyterlab/apputils": "^3.0.0-rc.7",
50+
"@jupyterlab/application": "^3.0.0-rc.10",
51+
"@jupyterlab/apputils": "^3.0.0-rc.10",
5252
"@jupyterlab/builder": "^3.0.0-rc.2",
53-
"@jupyterlab/codeeditor": "^3.0.0-rc.7",
54-
"@jupyterlab/codemirror": "^3.0.0-rc.7",
55-
"@jupyterlab/coreutils": "^5.0.0-rc.7",
56-
"@jupyterlab/docmanager": "^3.0.0-rc.7",
57-
"@jupyterlab/docregistry": "^3.0.0-rc.7",
58-
"@jupyterlab/fileeditor": "^3.0.0-rc.7",
59-
"@jupyterlab/notebook": "^3.0.0-rc.7",
60-
"@jupyterlab/observables": "^4.0.0-rc.7",
61-
"@jupyterlab/services": "^6.0.0-rc.7",
53+
"@jupyterlab/codeeditor": "^3.0.0-rc.10",
54+
"@jupyterlab/codemirror": "^3.0.0-rc.10",
55+
"@jupyterlab/coreutils": "^5.0.0-rc.10",
56+
"@jupyterlab/docmanager": "^3.0.0-rc.10",
57+
"@jupyterlab/docregistry": "^3.0.0-rc.10",
58+
"@jupyterlab/fileeditor": "^3.0.0-rc.10",
59+
"@jupyterlab/notebook": "^3.0.0-rc.10",
60+
"@jupyterlab/observables": "^4.0.0-rc.10",
61+
"@jupyterlab/services": "^6.0.0-rc.10",
6262
"@jupyterlab/testutils": "~2.2.0",
6363
"@lumino/algorithm": "^1.3.3",
6464
"@types/chai": "^4.1.7",
@@ -79,4 +79,4 @@
7979
"schemaDir": "schema",
8080
"outputDir": "../../py_src/jupyter_lsp/labextensions/@krassowski/jupyterlab_go_to_definition"
8181
}
82-
}
82+
}

‎packages/jupyterlab-lsp/package.json

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,23 @@
6464
},
6565
"devDependencies": {
6666
"@babel/preset-env": "^7.4.3",
67-
"@jupyterlab/application": "^3.0.0-rc.7",
68-
"@jupyterlab/apputils": "^3.0.0-rc.7",
67+
"@jupyterlab/application": "^3.0.0-rc.10",
68+
"@jupyterlab/apputils": "^3.0.0-rc.10",
6969
"@jupyterlab/builder": "^3.0.0-rc.2",
70-
"@jupyterlab/cells": "^3.0.0-rc.7",
71-
"@jupyterlab/codeeditor": "^3.0.0-rc.7",
72-
"@jupyterlab/codemirror": "^3.0.0-rc.7",
73-
"@jupyterlab/completer": "^3.0.0-rc.7",
74-
"@jupyterlab/coreutils": "^5.0.0-rc.7",
75-
"@jupyterlab/docmanager": "^3.0.0-rc.7",
76-
"@jupyterlab/docregistry": "^3.0.0-rc.7",
77-
"@jupyterlab/fileeditor": "^3.0.0-rc.7",
78-
"@jupyterlab/notebook": "^3.0.0-rc.7",
79-
"@jupyterlab/rendermime": "^3.0.0-rc.7",
80-
"@jupyterlab/services": "^6.0.0-rc.7",
81-
"@jupyterlab/statusbar": "^3.0.0-rc.7",
82-
"@jupyterlab/testutils": "^3.0.0-rc.7",
83-
"@jupyterlab/tooltip": "^3.0.0-rc.7",
70+
"@jupyterlab/cells": "^3.0.0-rc.10",
71+
"@jupyterlab/codeeditor": "^3.0.0-rc.10",
72+
"@jupyterlab/codemirror": "^3.0.0-rc.10",
73+
"@jupyterlab/completer": "^3.0.0-rc.10",
74+
"@jupyterlab/coreutils": "^5.0.0-rc.10",
75+
"@jupyterlab/docmanager": "^3.0.0-rc.10",
76+
"@jupyterlab/docregistry": "^3.0.0-rc.10",
77+
"@jupyterlab/fileeditor": "^3.0.0-rc.10",
78+
"@jupyterlab/notebook": "^3.0.0-rc.10",
79+
"@jupyterlab/rendermime": "^3.0.0-rc.10",
80+
"@jupyterlab/services": "^6.0.0-rc.10",
81+
"@jupyterlab/statusbar": "^3.0.0-rc.10",
82+
"@jupyterlab/testutils": "^3.0.0-rc.10",
83+
"@jupyterlab/tooltip": "^3.0.0-rc.10",
8484
"@lumino/algorithm": "^1.3.3",
8585
"@lumino/widgets": "^1.14.0",
8686
"@types/chai": "^4.1.7",
@@ -102,22 +102,22 @@
102102
"typescript": "~4.0.3"
103103
},
104104
"peerDependencies": {
105-
"@jupyterlab/application": "^3.0.0-rc.7",
106-
"@jupyterlab/apputils": "^3.0.0-rc.7",
107-
"@jupyterlab/cells": "^3.0.0-rc.7",
108-
"@jupyterlab/codeeditor": "^3.0.0-rc.7",
109-
"@jupyterlab/codemirror": "^3.0.0-rc.7",
110-
"@jupyterlab/completer": "^3.0.0-rc.7",
111-
"@jupyterlab/coreutils": "^5.0.0-rc.7",
112-
"@jupyterlab/docmanager": "^3.0.0-rc.7",
113-
"@jupyterlab/docregistry": "^3.0.0-rc.7",
114-
"@jupyterlab/fileeditor": "^3.0.0-rc.7",
115-
"@jupyterlab/notebook": "^3.0.0-rc.7",
116-
"@jupyterlab/rendermime": "^3.0.0-rc.7",
117-
"@jupyterlab/services": "^6.0.0-rc.7",
118-
"@jupyterlab/statusbar": "^3.0.0-rc.7",
119-
"@jupyterlab/tooltip": "^3.0.0-rc.7",
120-
"@jupyterlab/ui-components": "^3.0.0-rc.7",
105+
"@jupyterlab/application": "^3.0.0-rc.10",
106+
"@jupyterlab/apputils": "^3.0.0-rc.10",
107+
"@jupyterlab/cells": "^3.0.0-rc.10",
108+
"@jupyterlab/codeeditor": "^3.0.0-rc.10",
109+
"@jupyterlab/codemirror": "^3.0.0-rc.10",
110+
"@jupyterlab/completer": "^3.0.0-rc.10",
111+
"@jupyterlab/coreutils": "^5.0.0-rc.10",
112+
"@jupyterlab/docmanager": "^3.0.0-rc.10",
113+
"@jupyterlab/docregistry": "^3.0.0-rc.10",
114+
"@jupyterlab/fileeditor": "^3.0.0-rc.10",
115+
"@jupyterlab/notebook": "^3.0.0-rc.10",
116+
"@jupyterlab/rendermime": "^3.0.0-rc.10",
117+
"@jupyterlab/services": "^6.0.0-rc.10",
118+
"@jupyterlab/statusbar": "^3.0.0-rc.10",
119+
"@jupyterlab/tooltip": "^3.0.0-rc.10",
120+
"@jupyterlab/ui-components": "^3.0.0-rc.10",
121121
"@lumino/algorithm": "*",
122122
"@lumino/widgets": "*",
123123
"codemirror": "*",
@@ -138,4 +138,4 @@
138138
"schemaDir": "schema",
139139
"outputDir": "../../py_src/jupyter_lsp/labextensions/@krassowski/jupyterlab-lsp"
140140
}
141-
}
141+
}

‎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 >=3.0.0-rc.7,<4.0.0a0
3+
jupyterlab >=3.0.0-rc.10,<4.0.0a0

0 commit comments

Comments
 (0)