Merge branch 'py-lsp-server' of ssh://github.com/maresb/jupyterlab-lsp into maresb-py-lsp-server

Author: krassowski

python_packages/jupyter_lsp/jupyter_lsp/specs/__init__.py

@@ -7,7 +7,8 @@
 from .javascript_typescript_langserver import JavascriptTypescriptLanguageServer
 from .jedi_language_server import JediLanguageServer
 from .julia_language_server import JuliaLanguageServer
-from .pyls import PythonLanguageServer
+from .pyls import PalantirPythonLanguageServer
+from .python_lsp_server import PythonLSPServer
 from .r_languageserver import RLanguageServer
 from .sql_language_server import SQLLanguageServer
 from .texlab import Texlab
@@ -25,7 +26,8 @@
 json = VSCodeJSONLanguageServer()
 julia = JuliaLanguageServer()
 md = UnifiedLanguageServer()
-py = PythonLanguageServer()
+py_palantir = PalantirPythonLanguageServer()
+py_lsp_server = PythonLSPServer()
 r = RLanguageServer()
 tex = Texlab()
 ts = JavascriptTypescriptLanguageServer()

python_packages/jupyter_lsp/jupyter_lsp/specs/pyls.py

@@ -2,7 +2,7 @@
 from .utils import PythonModuleSpec
 
 
-class PythonLanguageServer(PythonModuleSpec):
+class PalantirPythonLanguageServer(PythonModuleSpec):
     python_module = key = "pyls"
     languages = ["python"]
     spec = dict(

python_packages/jupyter_lsp/jupyter_lsp/specs/python_lsp_server.py

@@ -0,0 +1,49 @@
+from .config import load_config_schema
+from .utils import PythonModuleSpec
+
+
+class PythonLSPServer(PythonModuleSpec):
+    python_module = key = "python-lsp-server"
+    languages = ["python"]
+    spec = dict(
+        display_name="python-lsp-server",
+        mime_types=["text/python", "text/x-ipython"],
+        urls=dict(
+            home="https://github.com/python-lsp/python-lsp-server",
+            issues="https://github.com/python-lsp/python-lsp-server/issues",
+        ),
+        install=dict(
+            pip="pip install 'python-lsp-server[all]'",
+            conda="conda install -c conda-forge python-lsp-server",
+        ),
+        extend=[
+            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",
+                    conda="conda install pyls-isort",
+                ),
+            ),
+            dict(
+                display_name="pyls-memestra",
+                install=dict(
+                    pip="pip install pyls-memestra",
+                    conda="conda install pyls-memestra",
+                ),
+            ),
+        ],
+        config_schema=load_config_schema(key),
+        env=dict(PYTHONUNBUFFERED="1"),
+    )

python_packages/jupyter_lsp/setup.cfg

@@ -39,7 +39,8 @@ jupyter_lsp_spec_v1 =
     javascript-typescript-langserver = jupyter_lsp.specs:ts
     jedi-language-server = jupyter_lsp.specs:jedi
     julia-language-server = jupyter_lsp.specs:julia
-    python-language-server = jupyter_lsp.specs:py
+    python-language-server = jupyter_lsp.specs:py_palantir
+    python-lsp-server = jupyter_lsp.specs:py_lsp_server
     r-languageserver = jupyter_lsp.specs:r
     texlab = jupyter_lsp.specs:tex
     sql-language-server = jupyter_lsp.specs:sql