bump to newest isort, pull more deps from conda

Author: bollwyvl

binder/environment.yml

@@ -17,16 +17,13 @@ dependencies:
   # 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 +33,5 @@ dependencies:
   - tectonic
   - texlab
   - chktex
+  # TODO: remove when jedi vs IPython is resolved
+  - jedi <0.18

requirements/github-actions.yml

@@ -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

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

scripts/nblint.py

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

setup.cfg

@@ -69,9 +69,7 @@ addopts =
     --flake8
 
 [isort]
-combine_as_imports = True
-include_trailing_comma = True
-line_length = 88
+profile = black
 multi_line_output = 3
 
 [pycodestyle]