Use isort to keep imports sorted

Disable hacking H301 and H306 which aren't compatible with isort.

.flake8

@@ -1,5 +1,5 @@
 [flake8]
-extend-ignore = E203, E266, E501
+extend-ignore = E203, E266, E501, H301, H306
 # line length is intentionally set to 80 here because black uses Bugbear
 # See https://github.com/psf/black/blob/master/docs/the_black_code_style.md#line-length for more details
 max-line-length = 80

pyproject.toml

@@ -12,3 +12,9 @@ exclude = '''
   )/
 )
 '''
+
+[tool.isort]
+profile = "black"
+multi_line_output = 3
+
+known_first_party = ["testinfra"]

setup.py

@@ -17,6 +17,7 @@
 def local_scheme(version):
     """Generate a PEP440 compatible version if PEP440_VERSION is enabled"""
     import os
+
     import setuptools_scm.version  # only present during setup time
 
     return (

test/conftest.py

@@ -21,9 +21,8 @@
 import pytest
 
 import testinfra
-from testinfra.backend.base import BaseBackend
 from testinfra.backend import parse_hostspec
-
+from testinfra.backend.base import BaseBackend
 
 BASETESTDIR = os.path.abspath(os.path.dirname(__file__))
 BASEDIR = os.path.abspath(os.path.join(BASETESTDIR, os.pardir))

test/test_backends.py

@@ -12,13 +12,13 @@
 
 import operator
 import os
-import pytest
 import tempfile
 
+import pytest
+
 import testinfra
 import testinfra.backend
-from testinfra.backend.base import BaseBackend
-from testinfra.backend.base import HostSpec
+from testinfra.backend.base import BaseBackend, HostSpec
 from testinfra.backend.winrm import _quote
 from testinfra.utils.ansible_runner import AnsibleRunner
 

test/test_modules.py

@@ -13,14 +13,11 @@
 import crypt
 import datetime
 import os
-import pytest
 import re
 import time
+from ipaddress import IPv4Address, IPv6Address, ip_address
 
-from ipaddress import ip_address
-from ipaddress import IPv4Address
-from ipaddress import IPv6Address
-
+import pytest
 
 from testinfra.modules.socket import parse_socketspec
 

testinfra/__init__.py

@@ -10,7 +10,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from testinfra.host import get_host
-from testinfra.host import get_hosts
+from testinfra.host import get_host, get_hosts
 
 __all__ = ["get_host", "get_hosts"]

testinfra/backend/__init__.py

@@ -14,7 +14,6 @@
 import os
 import urllib.parse
 
-
 BACKENDS = {
     "local": "testinfra.backend.local.LocalBackend",
     "ssh": "testinfra.backend.ssh.SshBackend",

testinfra/backend/winrm.py

@@ -11,6 +11,7 @@
 # limitations under the License.
 
 import re
+
 from testinfra.backend import base
 
 try:

testinfra/modules/socket.py

@@ -11,9 +11,7 @@
 # limitations under the License.
 
 import socket
-from typing import List
-from typing import Optional
-from typing import Tuple
+from typing import List, Optional, Tuple
 
 from testinfra.modules.base import Module
 from testinfra.utils import cached_property

testinfra/modules/supervisor.py

@@ -10,9 +10,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from testinfra.modules.base import Module
 from typing import NoReturn
 
+from testinfra.modules.base import Module
+
 STATUS = [
     "STOPPED",
     "STARTING",

testinfra/plugin.py

@@ -17,6 +17,7 @@
 import time
 
 import pytest
+
 import testinfra
 import testinfra.host
 import testinfra.modules

testinfra/utils/ansible_runner.py

@@ -16,16 +16,11 @@
 import json
 import os
 import tempfile
-from typing import Dict
-from typing import List
-from typing import Optional
-from typing import Union
-
+from typing import Dict, List, Optional, Union
 
 import testinfra
 from testinfra.utils import cached_property
 
-
 __all__ = ["AnsibleRunner"]
 
 local = testinfra.get_host("local://")

tox.ini

@@ -27,8 +27,10 @@ deps=
   flake8-pep3101
   flake8-print
   black
+  isort
 commands=
   black --check --diff {toxinidir}
+  isort --check --diff testinfra test setup.py
   flake8 {posargs}
 
 [testenv:docs]