fix isort usage, run linters

Author: bollwyvl

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/docs.yml

@@ -9,13 +9,12 @@ dependencies:
   - 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

scripts/bump_versions.py

@@ -7,7 +7,8 @@
 from pathlib import Path
 from typing import List
 
-from integrity import CHANGELOG, PIPE_FILE as PIPELINE
+from integrity import CHANGELOG
+from integrity import PIPE_FILE as PIPELINE
 
 ROOT = Path.cwd()
 

scripts/integrity.py

@@ -27,10 +27,8 @@
 if True:
     # a workaround for isort 4.0 limitations
     # see https://github.com/timothycrosley/isort/issues/468
-    from versions import (  # noqa
-        REQUIRED_JUPYTERLAB as LAB_SPEC,
-        JUPYTER_LSP_VERSION as PY_VERSION,
-    )
+    from versions import JUPYTER_LSP_VERSION as PY_VERSION
+    from versions import REQUIRED_JUPYTERLAB as LAB_SPEC  # noqa
 
 REQS = ROOT / "requirements"
 BINDER = ROOT / "binder"

scripts/lint.py

@@ -52,7 +52,7 @@ def lint():
         map(
             call,
             [
-                ["isort", "-rc", *ALL_PY],
+                ["isort", *ALL_PY],
                 ["black", *ALL_PY],
                 ["flake8", *ALL_PY],
                 # ["pylint", *ALL_PY],

scripts/nblint.py

@@ -5,7 +5,6 @@
 
 import black
 import isort
-from isort.api import sort_code_string
 import nbformat
 
 OK = 0
@@ -22,6 +21,7 @@
 
 ISORT_CONFIG = isort.settings.Config(settings_path=ROOT / "setup.cfg")
 
+
 def blacken(source):
     return black.format_str(source, mode=black.FileMode(line_length=88))
 
@@ -63,7 +63,7 @@ def nblint():
                     changes += 1
                 if source.startswith("%"):
                     continue
-                new = isort.sort_code_string(source, config=ISORT_CONFIG)
+                new = isort.api.sort_code_string(source, config=ISORT_CONFIG)
                 new = blacken(new).rstrip()
                 if new != source:
                     cell["source"] = new.splitlines(True)

setup.cfg

@@ -71,6 +71,7 @@ addopts =
 [isort]
 profile = black
 multi_line_output = 3
+known_first_party = jupyter_lsp
 
 [pycodestyle]
 ignore = E203,W503,C0330