update isort and black

datamodel_code_generator/format.py

@@ -4,7 +4,7 @@
 
 import black
 import toml
-from isort import SortImports
+import isort
 
 
 class PythonVersion(Enum):
@@ -49,4 +49,7 @@ def apply_black(code: str, python_version: PythonVersion) -> str:
 
 
 def apply_isort(code: str) -> str:
-    return SortImports(file_contents=code).output
+    if isort.__version__.startswith('4.'):
+        return isort.SortImports(file_contents=code).output
+    else:
+        return isort.code(code)

scripts/lint.sh

@@ -2,6 +2,15 @@
 
 set -e
 
+python -m venv lint
+source lint/bin/activate
+
+pip install black==19.10b0 "isort>=4.3.21,<5.0"
+
 black --check datamodel_code_generator tests
-isort --recursive --check-only datamodel_code_generator tests
+isort --check-only datamodel_code_generator tests
+
+deactivate
+rm -r lint
+
 mypy datamodel_code_generator

scripts/test.bat

@@ -1 +1,12 @@
-pytest --cov=datamodel_code_generator --cov-report term-missing tests
+python -m venv venv
+
+venv\Scripts\activate.bat
+
+pip install -e .[all] isort==4.3.21 "black>=19.10b0,<20"
+
+pytest --cov=datamodel_code_generator --cov-report term-missing tests
+
+deactivate.bat
+
+del /f /s /q venv 1>nul
+rmdir /s /q venv

scripts/test.sh

@@ -1,4 +1,12 @@
 #!/usr/bin/env bash
 set -e
 
-pytest --cov=datamodel_code_generator --cov-report term-missing tests
+python -m venv venv
+
+source venv/bin/activate
+pip install -e .[all] isort==4.3.21 "black>=19.10b0,<20"
+
+pytest --cov=datamodel_code_generator --cov-report term-missing tests
+
+deactivate
+rm -r venv

setup.cfg

@@ -33,7 +33,7 @@ install_requires =
     inflect>=4.1.0,<5.0
     pydantic[email]>=1.5.1,<2.0
     black>=19.10b0,<20
-    isort>=4.3.21,<5.0
+    isort>=4.3.21,<6.0
     PySnooper>=0.4.1,<1.0.0
     toml>=0.10.0,<1.0.0
     genson>=1.2.1,<2.0