Skip to content

Commit 5c2095f

Browse files
committed
fix integrity
1 parent 4868027 commit 5c2095f

File tree

2 files changed

+4
-22
lines changed

2 files changed

+4
-22
lines changed

docs/Installation.ipynb

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,6 @@
1515
"\n",
1616
"Delivering LSP features to your JupyterLab **requires** three pieces:\n",
1717
"\n",
18-
<<<<<<< HEAD
19-
"- `jupyter_lsp`\n",
20-
" - runs in your `notebook` web application on your server\n",
21-
" - to run, you need:\n",
22-
" - `python >=3.5`\n",
23-
" - `notebook >=4.3`\n",
24-
"- `@krassowski/jupyterlab-lsp`\n",
25-
" - runs in your browser\n",
26-
" - to install it, you need:\n",
27-
" - `nodejs >=10`\n",
28-
" - `jupyterlab >=2,<2.1.0a0`\n",
29-
"- one or more language servers\n",
30-
" - run on your server\n",
31-
" - some can be automatically [detected](./Language%20Servers.ipynb) if\n",
32-
" installed\n",
33-
" - others also need to be [configured](./Configuring.ipynb#language_servers)"
34-
=======
3518
"#### `jupyter-lsp`\n",
3619
"\n",
3720
"- runs in your `notebook` web application on your server to handle requests from\n",
@@ -53,7 +36,6 @@
5336
" - probably in another language runtime than python\n",
5437
"- some can be automatically [detected](./Language%20Servers.ipynb) if installed\n",
5538
"- others also need to be [configured](./Configuring.ipynb#language_servers)"
56-
>>>>>>> upstream/master
5739
]
5840
},
5941
{
@@ -77,7 +59,7 @@
7759
"# Also consider: r-languageserver [*]\n",
7860
"source activate lsp\n",
7961
"python -m pip install 'jupyter-lsp=0.8.0' --no-deps\n",
80-
"jupyter labextension install '@krassowski/jupyterlab-lsp@0.8.0'\n",
62+
"jupyter labextension install '@krassowski/jupyterlab-lsp@1.0.0'\n",
8163
"```\n",
8264
"\n",
8365
"Then run\n",
@@ -118,7 +100,7 @@
118100
" && python3 -m pip install --no-cache-dir --no-deps \\\n",
119101
" 'jupyter-lsp=0.8.0' \\\n",
120102
" && jupyter labextension install --no-build \\\n",
121-
" '@krassowski/jupyterlab-lsp@0.8.0' \\\n",
103+
" '@krassowski/jupyterlab-lsp@1.0.0' \\\n",
122104
" && jupyter lab build --dev-build=False --minimize=True \\\n",
123105
" && conda clean --all -f -y \\\n",
124106
" && rm -rf \\\n",
@@ -227,7 +209,7 @@
227209
"\n",
228210
"```bash\n",
229211
"pip install jupyter-lsp=0.8.0\n",
230-
"jupyter labextension install @krassowski/jupyterlab-lsp@0.8.0\n",
212+
"jupyter labextension install @krassowski/jupyterlab-lsp@1.0.0\n",
231213
"```"
232214
]
233215
},

scripts/integrity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ def test_changelog_versions(pkg, version):
164164

165165
@pytest.mark.parametrize(
166166
"pkg,sep,version,expected",
167-
[[PY_NAME, "=", PY_VERSION, 3], [MAIN_NAME, "@", MAIN_EXT_VERSION, 3]],
167+
[[PY_NAME, "=", PY_VERSION, 3], [JS_LSP_NAME, "@", JS_LSP_VERSION, 3]],
168168
)
169169
def test_installation_versions(the_installation_notebook, pkg, sep, version, expected):
170170
assert the_installation_notebook.count(f"{pkg}{sep}{version}") == expected

0 commit comments

Comments
 (0)