From f76d71d0f3c2ba463c5cd38c1a58998e302d09ff Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Mon, 31 Aug 2020 18:21:38 -0700 Subject: [PATCH] Simplify and update lint configurations - flake8 ignores W503 by default - Use isort profile to simplify configuration - Update isort CLI invocation for 5.* series --- setup.cfg | 8 ++------ test/test_html2text.py | 3 ++- tox.ini | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/setup.cfg b/setup.cfg index 3efd0479bf..22875af7f8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -40,15 +40,11 @@ html2text = py.typed [flake8] max_line_length = 88 -ignore = - E203 - W503 +extend-ignore = E203 [isort] combine_as_imports = True -include_trailing_comma = True -line_length = 88 -multi_line_output = 3 +profile = black [mypy] python_version = 3.5 diff --git a/test/test_html2text.py b/test/test_html2text.py index 39fa37e36d..f724fc8ab9 100644 --- a/test/test_html2text.py +++ b/test/test_html2text.py @@ -4,9 +4,10 @@ import subprocess import sys -import html2text import pytest +import html2text + skip = object() diff --git a/tox.ini b/tox.ini index fb4403cf8b..9737bbc851 100644 --- a/tox.ini +++ b/tox.ini @@ -33,9 +33,9 @@ skip_install = true [testenv:isort] basepython = python3 commands = - isort --check-only --diff + isort --check --diff . deps = - isort + isort >= 5.0.1 skip_install = true [testenv:mypy]