Merge branch 'master' into fix-hover

Author: krassowski

.github/workflows/job.test.yml

@@ -14,7 +14,7 @@ defaults:
 env:
   # TODO extract these from files instead
   PY_JLSP_VERSION: 0.9.2
-  JS_JLLSP_VERSION: 2.0.5
+  JS_JLLSP_VERSION: 2.0.6
   JS_JLG2D_VERSION: 1.0.0
 
   PYTHONUNBUFFERED: 1

CHANGELOG.md

@@ -1,6 +1,6 @@
 ## CHANGELOG
 
-### `@krassowski/jupyterlab-lsp 2.0.6` (unreleased)
+### `@krassowski/jupyterlab-lsp 2.0.6` (2020-09-15)
 
 - bug fixes
 

README.md

@@ -1,6 +1,6 @@
 # Language Server Protocol integration for Jupyter(Lab)
 
-[![Build Status](https://travis-ci.org/krassowski/jupyterlab-lsp.svg?branch=master)](https://travis-ci.org/krassowski/jupyterlab-lsp) ![tests](https://github.com/krassowski/jupyterlab-lsp/workflows/ttests/badge.svg) [![Documentation Status](https://readthedocs.org/projects/jupyterlab-lsp/badge/?version=latest)](https://jupyterlab-lsp.readthedocs.io/en/latest/?badge=latest) [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/krassowski/jupyterlab-lsp/master?urlpath=lab%2Ftree%2Fexamples%2FPython.ipynb)
+[![Build Status](https://travis-ci.org/krassowski/jupyterlab-lsp.svg?branch=master)](https://travis-ci.org/krassowski/jupyterlab-lsp) ![tests](https://github.com/krassowski/jupyterlab-lsp/workflows/tests/badge.svg) [![Documentation Status](https://readthedocs.org/projects/jupyterlab-lsp/badge/?version=latest)](https://jupyterlab-lsp.readthedocs.io/en/latest/?badge=latest) [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/krassowski/jupyterlab-lsp/master?urlpath=lab%2Ftree%2Fexamples%2FPython.ipynb)
 
 > _This project is still maturing, but you are welcome to check it out, leave feedback and/or a PR_
 
@@ -96,19 +96,16 @@ Use of a python `virtualenv` or a conda env is also recommended.
    conda install -c conda-forge python=3
    ```
 
-1. install JupyterLab
+1. install JupyterLab and the server extension
 
    ```bash
-   conda install -c conda-forge 'jupyterlab>=2.2,<3.0.0a0'
+   conda install -c conda-forge 'jupyterlab>=2.2,<3.0.0a0' jupyter-lsp
    # or
-   pip install 'jupyterlab>=2.2,<3.0.0a0'
+   pip install 'jupyterlab>=2.2,<3.0.0a0' jupyter-lsp
    ```
 
-1. install the server extension:
-
-   ```bash
-   pip install jupyter-lsp
-   ```
+   > Note: With conda, you could take advantage of the meta-packages `jupyter-lsp-python`
+   > or `jupyter-lsp-r` to install the language server and the server extension.
 
 1. install `nodejs`
 
@@ -175,6 +172,9 @@ Use of a python `virtualenv` or a conda env is also recommended.
 To update previously installed extensions:
 
 ```bash
+conda update jupyter-lsp
+jupyter labextension update @krassowski/jupyterlab-lsp
+# or
 pip install -U jupyter-lsp
 jupyter labextension update @krassowski/jupyterlab-lsp
 ```

docs/Installation.ipynb

@@ -97,10 +97,11 @@
     "#### conda (minimal python)\n",
     "\n",
     "```bash\n",
-    "conda create -c conda-forge -n lsp 'python >=3.7,<3.8' 'jupyterlab={JUPYTERLAB_VERSION}' 'nodejs>10' python-language-server\n",
-    "# Also consider: r-languageserver [*]\n",
-    "source activate lsp\n",
-    "python -m pip install 'jupyter-lsp={JUPYTER_LSP_VERSION}' --no-deps\n",
+    "conda create -c conda-forge -n lsp 'python >=3.7,<3.8' 'jupyterlab={JUPYTERLAB_VERSION}' 'nodejs>10' 'jupyter-lsp-python={JUPYTER_LSP_VERSION}'\n",
+    "# jupyter-lsp-python includes both the server extension (jupyter-lsp) and pyls third-party server (python-language-server)\n",
+    "# if you swap it with another pre-made bundle, jupyter-lsp-r, you will get the server extension and r-languageserver;\n",
+    "# alternatively, use jupyter-lsp and manually install a language server of your choice (see the table below).\n",
+    "conda activate lsp\n",
     "jupyter labextension install '@krassowski/jupyterlab-lsp@{JUPYTERLAB_LSP_VERSION}'\n",
     "```\n",
     "\n",
@@ -146,7 +147,6 @@
     "    'r-languageserver' \\\n",
     "    'texlab' \\\n",
     "    'chktex' \\\n",
-    "  && python3 -m pip install --no-cache-dir --no-deps \\\n",
     "    'jupyter-lsp={JUPYTER_LSP_VERSION}' \\\n",
     "  && jupyter labextension install --no-build \\\n",
     "    '@krassowski/jupyterlab-lsp@{JUPYTERLAB_LSP_VERSION}' \\\n",
@@ -261,8 +261,17 @@
     "%%markdown\n",
     "#### Install Jupyter[Lab] LSP\n",
     "\n",
+    "##### conda\n",
+    "\n",
+    "```bash\n",
+    "conda install jupyter-lsp={JUPYTER_LSP_VERSION}\n",
+    "jupyter labextension install @krassowski/jupyterlab-lsp@{JUPYTERLAB_LSP_VERSION}\n",
+    "```\n",
+    "\n",
+    "##### pip\n",
+    "\n",
     "```bash\n",
-    "pip install jupyter-lsp={JUPYTER_LSP_VERSION}\n",
+    "pip install jupyter-lsp=={JUPYTER_LSP_VERSION}\n",
     "jupyter labextension install @krassowski/jupyterlab-lsp@{JUPYTERLAB_LSP_VERSION}\n",
     "```"
    ]

packages/jupyterlab-lsp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@krassowski/jupyterlab-lsp",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "Language Server Protocol integration for JupyterLab",
   "keywords": [
     "jupyter",

packages/metapackage/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@krassowski/jupyterlab-lsp-metapackage",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "JupyterLab LSP - Meta Package. All of the packages used by JupyterLab LSP",
   "homepage": "https://github.com/krassowski/jupyterlab-lsp",
   "bugs": {

py_src/jupyter_lsp/specs/pyls.py

@@ -17,8 +17,18 @@ class PythonLanguageServer(PythonModuleSpec):
             conda="conda install -c conda-forge python-language-server",
         ),
         extend=[
-            dict(display_name="pyls-mypy", install=dict(pip="pip install pyls-mypy")),
-            dict(display_name="pyls-black", install=dict(pip="pip install pyls-black")),
+            dict(
+                display_name="pyls-mypy",
+                install=dict(
+                    pip="pip install pyls-mypy", conda="conda install pyls-mypy"
+                ),
+            ),
+            dict(
+                display_name="pyls-black",
+                install=dict(
+                    pip="pip install pyls-black", conda="conda install pyls-black"
+                ),
+            ),
             dict(display_name="pyls-isort", install=dict(pip="pip install pyls-isort")),
         ],
         config_schema=load_config_schema(key),

scripts/integrity.py

@@ -183,7 +183,12 @@ def test_changelog_versions(pkg, version):
 
 @pytest.mark.parametrize(
     "pkg,sep,version,expected",
-    [[PY_NAME, "=", PY_VERSION, 3], [JS_LSP_NAME, "@", JS_LSP_VERSION, 3]],
+    [
+        [PY_NAME, "=", PY_VERSION, 2],
+        [PY_NAME, "==", PY_VERSION, 1],
+        [PY_NAME + "-python", "=", PY_VERSION, 1],
+        [JS_LSP_NAME, "@", JS_LSP_VERSION, 4]
+    ],
 )
 def test_installation_versions(the_installation_notebook, pkg, sep, version, expected):
     assert the_installation_notebook.count(f"{pkg}{sep}{version}") == expected