Merge branch 'master' into add-highlights-debounce

Author: krassowski

atest/Keywords.robot

@@ -52,7 +52,7 @@ Create Notebok Server Config
 
 Read Page Config
     ${script} =    Get Element Attribute    id:jupyter-config-data    innerHTML
-    ${config} =    Evaluate    __import__("json").loads("""${script}""")
+    ${config} =    Evaluate    __import__("json").loads(r"""${script}""")
     Set Global Variable    ${PAGE CONFIG}    ${config}
     Set Global Variable    ${LAB VERSION}    ${config["appVersion"]}
 

binder/environment.yml

@@ -2,7 +2,7 @@ name: jupyterlab-lsp
 
 channels:
   - conda-forge
-  - defaults
+  - nodefaults
 
 dependencies:
   # runtime dependencies
@@ -12,21 +12,14 @@ dependencies:
   # build dependencies
   - nodejs >=10.12,<15
   # for python language server (and development)
-  - black
   - flake8 >=3.5
-  # isort 5.0 has breaking API changes which affect (among others) pylint and nblint;
-  # the pin should be removed once https://github.com/PyCQA/pylint/pull/3725 is merged
-  # see https://github.com/krassowski/jupyterlab-lsp/pull/291
-  - isort <5
-  - mypy
   - pip
   - pylint
+  - pyls-black
+  - pyls-isort
+  - pyls-mypy
   - python-language-server
   - ruamel_yaml
-  - pip: # not-yet-appearing-in-conda-forge
-      - pyls-black
-      - pyls-isort
-      - pyls-mypy
   # for R language server and kernel
   - r
   - r-irkernel
@@ -36,3 +29,5 @@ dependencies:
   - tectonic
   - texlab
   - chktex
+  # TODO: remove when jedi vs IPython is resolved
+  - jedi <0.18

docs/Configuring.ipynb

@@ -175,17 +175,18 @@
    ]
   },
   {
+   "cell_type": "markdown",
+   "metadata": {},
    "source": [
     "#### virtual_documents_dir\n",
     "\n",
     "> default: os.getenv(\"JP_LSP_VIRTUAL_DIR\", \".virtual_documents\")\n",
     "\n",
     "Path to virtual documents relative to the content manager root directory.\n",
     "\n",
-    "Its default value can be set with `JP_LSP_VIRTUAL_DIR` environment variable and fallback to `.virtual_documents`."
-   ],
-   "cell_type": "markdown",
-   "metadata": {}
+    "Its default value can be set with `JP_LSP_VIRTUAL_DIR` environment variable and\n",
+    "fallback to `.virtual_documents`."
+   ]
   },
   {
    "cell_type": "markdown",
@@ -224,4 +225,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}

py_src/jupyter_lsp/manager.py

@@ -6,7 +6,11 @@
 
 import entrypoints
 from notebook.transutils import _
-from traitlets import Bool, Dict as Dict_, Instance, List as List_, Unicode, default
+from traitlets import Bool
+from traitlets import Dict as Dict_
+from traitlets import Instance
+from traitlets import List as List_
+from traitlets import Unicode, default
 
 from .constants import (
     EP_LISTENER_ALL_V1,

py_src/jupyter_lsp/non_blocking.py

@@ -9,8 +9,8 @@
 
 if os.name == "nt":  # pragma: no cover
     import msvcrt
-    from ctypes import windll, byref, wintypes, WinError, POINTER
-    from ctypes.wintypes import HANDLE, DWORD, BOOL
+    from ctypes import POINTER, WinError, byref, windll, wintypes
+    from ctypes.wintypes import BOOL, DWORD, HANDLE
 else:  # pragma: no cover
     import fcntl
 

py_src/jupyter_lsp/types.py

@@ -20,7 +20,9 @@
 )
 
 from notebook.transutils import _
-from traitlets import Instance, List as List_, Unicode, default
+from traitlets import Instance
+from traitlets import List as List_
+from traitlets import Unicode, default
 from traitlets.config import LoggingConfigurable
 
 LanguageServerSpec = Dict[Text, Any]

requirements/atest.yml

@@ -2,7 +2,7 @@ name: jupyterlab-lsp
 
 channels:
   - conda-forge
-  - defaults
+  - nodefaults
 
 dependencies:
   - robotframework-seleniumlibrary

requirements/docs.yml

@@ -2,20 +2,19 @@ name: jupyterlab-lsp-docs
 
 channels:
   - conda-forge
-  - defaults
+  - nodefaults
 
 dependencies:
   - nbsphinx
   - pandas
   - pip
   - pytest
+  - pytest-check-links
   - python-graphviz
   - recommonmark
   - sphinx
   - sphinx_rtd_theme
   - sphinx-autobuild
   - sphinx-autodoc-typehints
   - sphinx-copybutton
-  - pip:
-      - pytest-check-links
-      - sphinx-markdown-tables
+  - sphinx-markdown-tables

requirements/github-actions.yml

@@ -2,7 +2,7 @@ name: jupyterlab-lsp
 
 channels:
   - conda-forge
-  - defaults
+  - nodefaults
 
 dependencies:
   - jupyterlab {lab}
@@ -35,3 +35,5 @@ dependencies:
   - geckodriver
   - robotframework >=3.2
   - robotframework-seleniumlibrary
+  # TODO: remove when jedi vs IPython is resolved
+  - jedi <0.18

requirements/lint.yml

@@ -2,14 +2,11 @@ name: jupyterlab-lsp
 
 channels:
   - conda-forge
-  - defaults
+  - nodefaults
 
 dependencies:
   - black
-  # isort 5.0 has breaking API changes which affect (among others) pylint and nblint;
-  # the pin should be removed once https://github.com/PyCQA/pylint/pull/3725 is merged
-  # see https://github.com/krassowski/jupyterlab-lsp/pull/291
-  - isort <5
+  - isort
   - mypy
   - robotframework-lint >=1.1
   - robotframework >=3.2