Use isort to automatically sort imports

check_patroni/cli.py

@@ -1,10 +1,10 @@
 import logging
 import re
 from configparser import ConfigParser
+from typing import List
 
 import click
 import nagiosplugin
-from typing import List
 
 from . import __version__, _log
 from .cluster import (
@@ -13,9 +13,10 @@ from .cluster import (
     ClusterHasLeader,
     ClusterHasLeaderSummary,
     ClusterHasReplica,
-    ClusterNodeCount,
     ClusterIsInMaintenance,
+    ClusterNodeCount,
 )
+from .convert import size_to_byte
 from .node import (
     NodeIsAlive,
     NodeIsAliveSummary,
@@ -31,8 +32,6 @@ from .node import (
     NodeTLHasChangedSummary,
 )
 from .types import ConnectionInfo, Parameters
-from .convert import size_to_byte
-
 
 DEFAULT_CFG = "config.ini"
 handler = logging.StreamHandler()

check_patroni/cluster.py

@@ -1,12 +1,12 @@
 import hashlib
 import json
 from collections import Counter
-
-import nagiosplugin
 from typing import Iterable, Union
 
+import nagiosplugin
+
 from . import _log
-from .types import PatroniResource, ConnectionInfo, handle_unknown
+from .types import ConnectionInfo, PatroniResource, handle_unknown
 
 
 def replace_chars(text: str) -> str:

check_patroni/convert.py

@@ -1,6 +1,7 @@
-import click
 import re
-from typing import Union, Tuple
+from typing import Tuple, Union
+
+import click
 
 
 def size_to_byte(value: str) -> int:

check_patroni/node.py

@@ -1,8 +1,9 @@
-import nagiosplugin
 from typing import Iterable
 
+import nagiosplugin
+
 from . import _log
-from .types import APIError, ConnectionInfo, handle_unknown, PatroniResource
+from .types import APIError, ConnectionInfo, PatroniResource, handle_unknown
 
 
 class NodeIsPrimary(PatroniResource):

check_patroni/types.py

@@ -1,9 +1,9 @@
+from typing import Any, Callable, List, Optional, Tuple, Union
 from urllib.parse import urlparse
 
 import attr
 import nagiosplugin
 import requests
-from typing import Any, Callable, List, Optional, Tuple, Union
 
 from . import _log
 

pyproject.toml

@@ -1,3 +1,6 @@
 [build-system]
 requires = ["setuptools", "setuptools-scm"]
 build-backend = "setuptools.build_meta"
+
+[tool.isort]
+profile = "black"

requirements-dev.txt

@@ -1,5 +1,6 @@
 black
 codespell
+isort
 flake8
 mypy==0.961
 pytest

tests/test_api.py

@@ -1,9 +1,9 @@
+from click.testing import CliRunner
 from pytest_mock import MockerFixture
 
-from click.testing import CliRunner
-
 from check_patroni.cli import main
-from tools import my_mock
+
+from .tools import my_mock
 
 
 def test_api_status_code_200(mocker: MockerFixture) -> None:

tests/test_cluster_config_has_changed.py

@@ -1,10 +1,10 @@
-from pytest_mock import MockerFixture
-
 import nagiosplugin
 from click.testing import CliRunner
+from pytest_mock import MockerFixture
 
 from check_patroni.cli import main
-from tools import my_mock, here
+
+from .tools import here, my_mock
 
 
 def test_cluster_config_has_changed_params(mocker: MockerFixture) -> None:

tests/test_cluster_has_leader.py

@@ -1,9 +1,9 @@
+from click.testing import CliRunner
 from pytest_mock import MockerFixture
 
-from click.testing import CliRunner
-
 from check_patroni.cli import main
-from tools import my_mock
+
+from .tools import my_mock
 
 
 def test_cluster_has_leader_ok(mocker: MockerFixture) -> None:

tests/test_cluster_has_replica.py

@@ -1,9 +1,9 @@
+from click.testing import CliRunner
 from pytest_mock import MockerFixture
 
-from click.testing import CliRunner
-
 from check_patroni.cli import main
-from tools import my_mock
+
+from .tools import my_mock
 
 
 # TODO Lag threshold tests

tests/test_cluster_is_in_maintenance.py

@@ -1,9 +1,9 @@
+from click.testing import CliRunner
 from pytest_mock import MockerFixture
 
-from click.testing import CliRunner
-
 from check_patroni.cli import main
-from tools import my_mock
+
+from .tools import my_mock
 
 
 def test_cluster_is_in_maintenance_ok(mocker: MockerFixture) -> None:

tests/test_cluster_node_count.py

@@ -1,9 +1,9 @@
+from click.testing import CliRunner
 from pytest_mock import MockerFixture
 
-from click.testing import CliRunner
-
 from check_patroni.cli import main
-from tools import my_mock
+
+from .tools import my_mock
 
 
 def test_cluster_node_count_ok(mocker: MockerFixture) -> None:

tests/test_node_is_alive.py

@@ -1,9 +1,9 @@
+from click.testing import CliRunner
 from pytest_mock import MockerFixture
 
-from click.testing import CliRunner
-
 from check_patroni.cli import main
-from tools import my_mock
+
+from .tools import my_mock
 
 
 def test_node_is_alive_ok(mocker: MockerFixture) -> None:

tests/test_node_is_pending_restart.py

@@ -1,9 +1,9 @@
+from click.testing import CliRunner
 from pytest_mock import MockerFixture
 
-from click.testing import CliRunner
-
 from check_patroni.cli import main
-from tools import my_mock
+
+from .tools import my_mock
 
 
 def test_node_is_pending_restart_ok(mocker: MockerFixture) -> None:

tests/test_node_is_primary.py

@@ -1,9 +1,9 @@
+from click.testing import CliRunner
 from pytest_mock import MockerFixture
 
-from click.testing import CliRunner
-
 from check_patroni.cli import main
-from tools import my_mock
+
+from .tools import my_mock
 
 
 def test_node_is_primary_ok(mocker: MockerFixture) -> None:

tests/test_node_is_replica.py

@@ -1,9 +1,9 @@
+from click.testing import CliRunner
 from pytest_mock import MockerFixture
 
-from click.testing import CliRunner
-
 from check_patroni.cli import main
-from tools import my_mock
+
+from .tools import my_mock
 
 
 def test_node_is_replica_ok(mocker: MockerFixture) -> None:

tests/test_node_patroni_version.py

@@ -1,9 +1,9 @@
+from click.testing import CliRunner
 from pytest_mock import MockerFixture
 
-from click.testing import CliRunner
-
 from check_patroni.cli import main
-from tools import my_mock
+
+from .tools import my_mock
 
 
 def test_node_patroni_version_ok(mocker: MockerFixture) -> None:

tests/test_node_tl_has_changed.py

@@ -1,11 +1,10 @@
+import nagiosplugin
 from click.testing import CliRunner
 from pytest_mock import MockerFixture
 
 from check_patroni.cli import main
 
-import nagiosplugin
+from .tools import here, my_mock
-
-from tools import my_mock, here
 
 
 def test_node_tl_has_changed_params(mocker: MockerFixture) -> None:

tests/tools.py

@@ -1,8 +1,9 @@
 import json
 import pathlib
-from pytest_mock import MockerFixture
 from typing import Any
 
+from pytest_mock import MockerFixture
+
 from check_patroni.types import APIError, PatroniResource
 
 here = pathlib.Path(__file__).parent

tox.ini

@@ -15,10 +15,12 @@ deps =
     codespell
     black
     flake8
+    isort
 commands =
     codespell {toxinidir}/check_patroni {toxinidir}/tests
     black --check --diff {toxinidir}/check_patroni {toxinidir}/tests
     flake8 {toxinidir}/check_patroni {toxinidir}/tests
+    isort --check --diff {toxinidir}/check_patroni {toxinidir}/tests
 
 [testenv:mypy]
 deps =