From df744bf7dcf93a1d2d0d5b759e0764437b0d9e38 Mon Sep 17 00:00:00 2001 From: benoit Date: Mon, 20 Mar 2023 11:44:19 +0100 Subject: [PATCH] Use isort to automatically sort imports --- check_patroni/cli.py | 7 +++---- check_patroni/cluster.py | 6 +++--- check_patroni/convert.py | 5 +++-- check_patroni/node.py | 5 +++-- check_patroni/types.py | 2 +- pyproject.toml | 3 +++ requirements-dev.txt | 1 + tests/__init__.py | 0 tests/test_api.py | 6 +++--- tests/test_cluster_config_has_changed.py | 6 +++--- tests/test_cluster_has_leader.py | 6 +++--- tests/test_cluster_has_replica.py | 6 +++--- tests/test_cluster_is_in_maintenance.py | 6 +++--- tests/test_cluster_node_count.py | 6 +++--- tests/test_node_is_alive.py | 6 +++--- tests/test_node_is_pending_restart.py | 6 +++--- tests/test_node_is_primary.py | 6 +++--- tests/test_node_is_replica.py | 6 +++--- tests/test_node_patroni_version.py | 6 +++--- tests/test_node_tl_has_changed.py | 5 ++--- tests/tools.py | 3 ++- tox.ini | 2 ++ 22 files changed, 56 insertions(+), 49 deletions(-) create mode 100644 tests/__init__.py diff --git a/check_patroni/cli.py b/check_patroni/cli.py index 20dd868..30c70ca 100644 --- a/check_patroni/cli.py +++ b/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() diff --git a/check_patroni/cluster.py b/check_patroni/cluster.py index 15fee80..62026cf 100644 --- a/check_patroni/cluster.py +++ b/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: diff --git a/check_patroni/convert.py b/check_patroni/convert.py index 3b04c4b..39c64e0 100644 --- a/check_patroni/convert.py +++ b/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: diff --git a/check_patroni/node.py b/check_patroni/node.py index ff1b877..2e99eaf 100644 --- a/check_patroni/node.py +++ b/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): diff --git a/check_patroni/types.py b/check_patroni/types.py index d96c216..756792c 100644 --- a/check_patroni/types.py +++ b/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 diff --git a/pyproject.toml b/pyproject.toml index 8fd8d67..6340740 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,6 @@ [build-system] requires = ["setuptools", "setuptools-scm"] build-backend = "setuptools.build_meta" + +[tool.isort] +profile = "black" diff --git a/requirements-dev.txt b/requirements-dev.txt index 12ba4f0..f53c628 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,6 @@ black codespell +isort flake8 mypy==0.961 pytest diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_api.py b/tests/test_api.py index 048e0d8..6e06768 100644 --- a/tests/test_api.py +++ b/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: diff --git a/tests/test_cluster_config_has_changed.py b/tests/test_cluster_config_has_changed.py index e279274..b6fb6b7 100644 --- a/tests/test_cluster_config_has_changed.py +++ b/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: diff --git a/tests/test_cluster_has_leader.py b/tests/test_cluster_has_leader.py index 87c17dd..641328c 100644 --- a/tests/test_cluster_has_leader.py +++ b/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: diff --git a/tests/test_cluster_has_replica.py b/tests/test_cluster_has_replica.py index 47f4528..10b31a1 100644 --- a/tests/test_cluster_has_replica.py +++ b/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 diff --git a/tests/test_cluster_is_in_maintenance.py b/tests/test_cluster_is_in_maintenance.py index 5b0b34c..cf388f6 100644 --- a/tests/test_cluster_is_in_maintenance.py +++ b/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: diff --git a/tests/test_cluster_node_count.py b/tests/test_cluster_node_count.py index aaf6f07..be3bbc0 100644 --- a/tests/test_cluster_node_count.py +++ b/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: diff --git a/tests/test_node_is_alive.py b/tests/test_node_is_alive.py index 405f9f4..40ac391 100644 --- a/tests/test_node_is_alive.py +++ b/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: diff --git a/tests/test_node_is_pending_restart.py b/tests/test_node_is_pending_restart.py index a3e652f..390424e 100644 --- a/tests/test_node_is_pending_restart.py +++ b/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: diff --git a/tests/test_node_is_primary.py b/tests/test_node_is_primary.py index 8512402..ef08a0e 100644 --- a/tests/test_node_is_primary.py +++ b/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: diff --git a/tests/test_node_is_replica.py b/tests/test_node_is_replica.py index 5d7c9ac..7208c5a 100644 --- a/tests/test_node_is_replica.py +++ b/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: diff --git a/tests/test_node_patroni_version.py b/tests/test_node_patroni_version.py index d66c49b..2224284 100644 --- a/tests/test_node_patroni_version.py +++ b/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: diff --git a/tests/test_node_tl_has_changed.py b/tests/test_node_tl_has_changed.py index 270f119..459e512 100644 --- a/tests/test_node_tl_has_changed.py +++ b/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 my_mock, here +from .tools import here, my_mock def test_node_tl_has_changed_params(mocker: MockerFixture) -> None: diff --git a/tests/tools.py b/tests/tools.py index 76f2ded..fc8a300 100644 --- a/tests/tools.py +++ b/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 diff --git a/tox.ini b/tox.ini index 321abdb..1b44e7e 100644 --- a/tox.ini +++ b/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 =