From cf14239ec951e99f1a0a35189cc5cfc8654c49ab Mon Sep 17 00:00:00 2001 From: pacrob Date: Thu, 4 May 2023 14:48:58 -0600 Subject: [PATCH] set isort version and settings to match template, add git blame ignore for isorting commit --- .git-blame-ignore-revs | 2 ++ setup.py | 2 +- tox.ini | 15 +++++---------- 3 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 000000000..f4b89a041 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# ignore SHA that added isort +2f421ce6049dc74a1520280adf8c350c1c567e9f diff --git a/setup.py b/setup.py index 2380b86f1..c9e6f69ea 100644 --- a/setup.py +++ b/setup.py @@ -43,11 +43,11 @@ 'lint': [ "flake8==3.8.2", "flake8-bugbear==20.1.4", + "isort>=5.10.1", "mypy==0.910", "pydocstyle>=6.0.0", "types-setuptools", "importlib-metadata<5.0;python_version<'3.8'", - "isort==5.11.4" ], 'benchmark': [ "termcolor>=1.1.0,<2.0.0", diff --git a/tox.ini b/tox.ini index 4d0184f8e..919ab7d90 100644 --- a/tox.ini +++ b/tox.ini @@ -10,18 +10,13 @@ envlist= py39-docs [isort] -profile=black -force_grid_wrap=1 -multi_line_output=3 -honor_noqa=true -float_to_top=true -combine_as_imports=true -force_sort_within_sections=true -include_trailing_comma=true +combine_as_imports=True extra_standard_library=pytest +force_grid_wrap=1 +force_sort_within_sections=True known_first_party=eth -line_length=88 -use_parentheses=true +multi_line_output=3 +profile=black # skip `__init__.py` files because sometimes order of initialization is important skip=__init__.py