Merge pull request #68 from carver/upgrade-isort

Upgrade isort

Makefile

@@ -31,8 +31,8 @@ lint:
 	tox -elint
 
 lint-roll:
-	isort --recursive <MODULE_NAME> tests
-	black {toxinidir}/<MODULE_NAME> {toxinidir}/tests setup.py
+	isort <MODULE_NAME> tests
+	black <MODULE_NAME> tests setup.py
 	$(MAKE) lint
 
 test:

setup.py

@@ -13,7 +13,7 @@ extras_require = {
     ],
     "lint": [
         "flake8==3.7.9",
-        "isort>=4.2.15,<5",
+        "isort>=5.10.1,<6",
         "mypy==0.770",
         "pydocstyle>=5.0.0,<6",
         "black>=22,<23",

tox.ini

@@ -7,17 +7,14 @@ envlist=
 [isort]
 combine_as_imports=True
 force_sort_within_sections=True
-include_trailing_comma=True
 known_third_party=hypothesis,pytest
 known_first_party=<MODULE_NAME>
-line_length=21
-multi_line_output=3
-use_parentheses=True
+profile=black
 
 [flake8]
 max-line-length= 100
 exclude= venv*,.tox,docs,build
-ignore=
+extend-ignore= E203
 
 [testenv]
 usedevelop=True
@@ -39,9 +36,10 @@ whitelist_externals=make
 [testenv:lint]
 basepython=python
 extras=lint
+whitelist_externals=black
 commands=
     mypy -p <MODULE_NAME> --config-file {toxinidir}/mypy.ini
     flake8 {toxinidir}/<MODULE_NAME> {toxinidir}/tests
-    isort --recursive --check-only --diff {toxinidir}/<MODULE_NAME> {toxinidir}/tests
+    isort --check-only --diff {toxinidir}/<MODULE_NAME> {toxinidir}/tests
     pydocstyle --explain {toxinidir}/<MODULE_NAME> {toxinidir}/tests
     black --check {toxinidir}/<MODULE_NAME> {toxinidir}/tests setup.py