Merge pull request #68 from carver/upgrade-isort

Upgrade isort
This commit is contained in:
Jason Carver
2022-10-04 16:58:54 -07:00
committed by GitHub
3 changed files with 7 additions and 9 deletions

View File

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

View File

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

10
tox.ini
View File

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