Reformat imports with isort (#3123)

Besides that:
1. Introduce `setup.py isort` for quick check
2. Introduce GH actions to check imports

tests/__init__.py

@@ -2,7 +2,8 @@ import datetime
 import os
 import shutil
 import unittest
-from unittest.mock import Mock, PropertyMock, patch
+
+from unittest.mock import Mock, patch, PropertyMock
 
 import urllib3
 

tests/test_api.py

@@ -1,12 +1,12 @@
 import datetime
 import json
-import unittest
 import socket
+import unittest
 
 from http.server import HTTPServer
 from io import BytesIO as IO
 from socketserver import ThreadingMixIn
-from unittest.mock import Mock, PropertyMock, patch
+from unittest.mock import Mock, patch, PropertyMock
 
 from patroni import global_config
 from patroni.api import RestApiHandler, RestApiServer
@@ -20,7 +20,6 @@ from patroni.utils import RetryFailedError, tzutc
 from . import MockConnect, psycopg_connect
 from .test_ha import get_cluster_initialized_without_leader
 
-
 future_restart_time = datetime.datetime.now(tzutc) + datetime.timedelta(days=5)
 postmaster_start_time = datetime.datetime.now(tzutc)
 

tests/test_async_executor.py

@@ -1,8 +1,9 @@
 import unittest
+
+from threading import Thread
 from unittest.mock import Mock, patch
 
 from patroni.async_executor import AsyncExecutor, CriticalTask
-from threading import Thread
 
 
 class TestAsyncExecutor(unittest.TestCase):

tests/test_aws.py

@@ -1,10 +1,12 @@
-import botocore
-import botocore.awsrequest
 import sys
 import unittest
 
-from unittest.mock import Mock, PropertyMock, patch
 from collections import namedtuple
+from unittest.mock import Mock, patch, PropertyMock
+
+import botocore
+import botocore.awsrequest
+
 from patroni.scripts.aws import AWSConnection, main as _main
 
 

tests/test_barman.py

@@ -1,16 +1,17 @@
 import logging
 import unittest
+
 from unittest import mock
 from unittest.mock import MagicMock, Mock, patch
+
 from urllib3.exceptions import MaxRetryError
 
 from patroni.scripts.barman.cli import main
-from patroni.scripts.barman.config_switch import (ExitCode as BarmanConfigSwitchExitCode, _should_skip_switch,
-                                                  _switch_config, run_barman_config_switch)
-from patroni.scripts.barman.recover import ExitCode as BarmanRecoverExitCode, _restore_backup, run_barman_recover
+from patroni.scripts.barman.config_switch import _should_skip_switch, _switch_config, \
+    ExitCode as BarmanConfigSwitchExitCode, run_barman_config_switch
+from patroni.scripts.barman.recover import _restore_backup, ExitCode as BarmanRecoverExitCode, run_barman_recover
 from patroni.scripts.barman.utils import ApiNotOk, OperationStatus, PgBackupApi, RetriesExceeded, set_up_logging
 
-
 API_URL = "http://localhost:7480"
 BARMAN_SERVER = "my_server"
 BARMAN_MODEL = "my_model"

tests/test_bootstrap.py

@@ -1,6 +1,7 @@
 import os
 import sys
-from unittest.mock import Mock, PropertyMock, patch
+
+from unittest.mock import Mock, patch, PropertyMock
 
 from patroni.async_executor import CriticalTask
 from patroni.collections import CaseInsensitiveDict
@@ -9,7 +10,7 @@ from patroni.postgresql.bootstrap import Bootstrap
 from patroni.postgresql.cancellable import CancellableSubprocess
 from patroni.postgresql.config import ConfigHandler, get_param_diff
 
-from . import psycopg_connect, BaseTestPostgresql, mock_available_gucs
+from . import BaseTestPostgresql, mock_available_gucs, psycopg_connect
 
 
 @patch('subprocess.call', Mock(return_value=0))

tests/test_callback_executor.py

@@ -1,7 +1,9 @@
-import psutil
 import unittest
+
 from unittest.mock import Mock, patch
 
+import psutil
+
 from patroni.postgresql.callback_executor import CallbackExecutor
 
 

tests/test_cancellable.py

@@ -1,7 +1,9 @@
-import psutil
 import unittest
+
 from unittest.mock import Mock, patch
 
+import psutil
+
 from patroni.exceptions import PostgresException
 from patroni.postgresql.cancellable import CancellableSubprocess
 

tests/test_citus.py

@@ -2,8 +2,8 @@ import time
 import unittest
 
 from copy import deepcopy
-from unittest.mock import Mock, patch, PropertyMock
 from typing import List
+from unittest.mock import Mock, patch, PropertyMock
 
 from patroni.postgresql.mpp.citus import CitusHandler, PgDistGroup, PgDistNode
 from patroni.psycopg import ProgrammingError

tests/test_config.py

@@ -1,7 +1,7 @@
+import io
 import os
 import sys
 import unittest
-import io
 
 from copy import deepcopy
 from unittest.mock import MagicMock, Mock, patch

tests/test_config_generator.py

@@ -1,19 +1,19 @@
 import os
-import psutil
 import unittest
-import yaml
 
-from . import MockConnect, MockCursor
 from copy import deepcopy
-from unittest.mock import MagicMock, Mock, PropertyMock, mock_open as _mock_open, patch
+from unittest.mock import MagicMock, Mock, mock_open as _mock_open, patch, PropertyMock
+
+import psutil
+import yaml
 
 from patroni.__main__ import main as _main
 from patroni.config import Config
 from patroni.config_generator import AbstractConfigGenerator, get_address, NO_VALUE_MSG
 from patroni.log import PatroniLogger
-from patroni.utils import patch_config, parse_bool
+from patroni.utils import parse_bool, patch_config
 
-from . import psycopg_connect
+from . import MockConnect, MockCursor, psycopg_connect
 
 HOSTNAME = 'test_hostname'
 IP = '1.9.8.4'

tests/test_consul.py

@@ -1,12 +1,16 @@
-import consul
 import unittest
-from unittest.mock import Mock, PropertyMock, patch
+
+from unittest.mock import Mock, patch, PropertyMock
+
+import consul
 
 from consul import ConsulException, NotFound
+
 from patroni.dcs import get_dcs
-from patroni.dcs.consul import AbstractDCS, Cluster, Consul, ConsulInternalError, \
-    ConsulError, ConsulClient, HTTPClient, InvalidSessionTTL, InvalidSession, RetryFailedError
+from patroni.dcs.consul import AbstractDCS, Cluster, Consul, ConsulClient, ConsulError, \
+    ConsulInternalError, HTTPClient, InvalidSession, InvalidSessionTTL, RetryFailedError
 from patroni.postgresql.mpp import get_mpp
+
 from . import SleepException
 
 

tests/test_ctl.py

@@ -1,28 +1,31 @@
-import click
-import etcd
 import os
 import unittest
 
-from click.testing import CliRunner
 from datetime import datetime, timedelta
+from unittest import mock
+from unittest.mock import Mock, patch, PropertyMock
+
+import click
+import etcd
+
+from click.testing import CliRunner
+from prettytable import ALL, PrettyTable
+from urllib3 import PoolManager
+
 from patroni import global_config
-from patroni.ctl import ctl, load_config, output_members, get_dcs, parse_dcs, \
-    get_all_members, get_any_member, get_cursor, query_member, PatroniCtlException, apply_config_changes, \
-    format_config_for_editing, show_diff, invoke_editor, format_pg_version, CONFIG_FILE_PATH, PatronictlPrettyTable
+from patroni.ctl import apply_config_changes, CONFIG_FILE_PATH, ctl, format_config_for_editing, \
+    format_pg_version, get_all_members, get_any_member, get_cursor, get_dcs, invoke_editor, load_config, \
+    output_members, parse_dcs, PatroniCtlException, PatronictlPrettyTable, query_member, show_diff
 from patroni.dcs import Cluster, Failover
 from patroni.postgresql.config import get_param_diff
 from patroni.postgresql.mpp import get_mpp
 from patroni.psycopg import OperationalError
 from patroni.utils import tzutc
-from prettytable import PrettyTable, ALL
-from unittest import mock
-from unittest.mock import patch, Mock, PropertyMock
-from urllib3 import PoolManager
 
 from . import MockConnect, MockCursor, MockResponse, psycopg_connect
 from .test_etcd import etcd_read, socket_getaddrinfo
-from .test_ha import get_cluster_initialized_without_leader, get_cluster_initialized_with_leader, \
-    get_cluster_initialized_with_only_leader, get_cluster_not_initialized_without_leader, get_cluster, Member
+from .test_ha import get_cluster, get_cluster_initialized_with_leader, get_cluster_initialized_with_only_leader, \
+    get_cluster_initialized_without_leader, get_cluster_not_initialized_without_leader, Member
 
 
 def get_default_config(*args):

tests/test_etcd.py

@@ -1,18 +1,21 @@
-import etcd
-import urllib3.util.connection
 import socket
 import unittest
 
+from unittest.mock import Mock, patch, PropertyMock
+
+import etcd
+import urllib3.util.connection
+
 from dns.exception import DNSException
+from urllib3.exceptions import ReadTimeoutError
+
 from patroni.dcs import get_dcs
-from patroni.dcs.etcd import AbstractDCS, EtcdClient, Cluster, Etcd, EtcdError, DnsCachingResolver
+from patroni.dcs.etcd import AbstractDCS, Cluster, DnsCachingResolver, Etcd, EtcdClient, EtcdError
 from patroni.exceptions import DCSError
 from patroni.postgresql.mpp import get_mpp
 from patroni.utils import Retry
-from unittest.mock import Mock, PropertyMock, patch
-from urllib3.exceptions import ReadTimeoutError
 
-from . import SleepException, MockResponse, requests_get
+from . import MockResponse, requests_get, SleepException
 
 
 def etcd_watch(self, key, index=None, timeout=None, recursive=None):

tests/test_etcd3.py

@@ -1,18 +1,20 @@
-import etcd
 import json
 import unittest
+
+from threading import Thread
+from unittest.mock import Mock, patch, PropertyMock
+
+import etcd
 import urllib3
-from unittest.mock import Mock, PropertyMock, patch
 
 from patroni.dcs import get_dcs
 from patroni.dcs.etcd import DnsCachingResolver
-from patroni.dcs.etcd3 import PatroniEtcd3Client, Cluster, Etcd3, Etcd3Client, \
-    Etcd3Error, Etcd3ClientError, RetryFailedError, InvalidAuthToken, Unavailable, \
-    Unknown, UnsupportedEtcdVersion, UserEmpty, AuthFailed, AuthOldRevision, base64_encode
+from patroni.dcs.etcd3 import AuthFailed, AuthOldRevision, base64_encode, Cluster, Etcd3, \
+    Etcd3Client, Etcd3ClientError, Etcd3Error, InvalidAuthToken, PatroniEtcd3Client, \
+    RetryFailedError, Unavailable, Unknown, UnsupportedEtcdVersion, UserEmpty
 from patroni.postgresql.mpp import get_mpp
-from threading import Thread
 
-from . import SleepException, MockResponse
+from . import MockResponse, SleepException
 
 
 def mock_urlopen(self, method, url, **kwargs):

tests/test_exhibitor.py

@@ -1,12 +1,14 @@
 import unittest
-import urllib3
+
 from unittest.mock import Mock, patch
 
+import urllib3
+
 from patroni.dcs import get_dcs
-from patroni.dcs.exhibitor import ExhibitorEnsembleProvider, Exhibitor
+from patroni.dcs.exhibitor import Exhibitor, ExhibitorEnsembleProvider
 from patroni.dcs.zookeeper import ZooKeeperError
 
-from . import SleepException, requests_get
+from . import requests_get, SleepException
 from .test_zookeeper import MockKazooClient
 
 

tests/test_file_perm.py

@@ -1,5 +1,6 @@
-import unittest
 import stat
+import unittest
+
 from unittest.mock import Mock, patch
 
 from patroni.file_perm import pg_perm

tests/test_ha.py

@@ -1,16 +1,18 @@
 import datetime
-import etcd
 import os
 import sys
-from unittest.mock import Mock, MagicMock, PropertyMock, patch, mock_open
+
+from unittest.mock import MagicMock, Mock, mock_open, patch, PropertyMock
+
+import etcd
 
 from patroni import global_config
 from patroni.collections import CaseInsensitiveSet
 from patroni.config import Config
-from patroni.dcs import Cluster, ClusterConfig, Failover, Leader, Member, get_dcs, Status, SyncState, TimelineHistory
+from patroni.dcs import Cluster, ClusterConfig, Failover, get_dcs, Leader, Member, Status, SyncState, TimelineHistory
 from patroni.dcs.etcd import AbstractEtcdClientWithFailover
-from patroni.exceptions import DCSError, PostgresConnectionException, PatroniFatalException
-from patroni.ha import Ha, _MemberStatus
+from patroni.exceptions import DCSError, PatroniFatalException, PostgresConnectionException
+from patroni.ha import _MemberStatus, Ha
 from patroni.postgresql import Postgresql
 from patroni.postgresql.bootstrap import Bootstrap
 from patroni.postgresql.cancellable import CancellableSubprocess
@@ -22,8 +24,8 @@ from patroni.postgresql.sync import _SyncState
 from patroni.utils import tzutc
 from patroni.watchdog import Watchdog
 
-from . import PostgresInit, MockPostmaster, psycopg_connect, requests_get
-from .test_etcd import socket_getaddrinfo, etcd_read, etcd_write
+from . import MockPostmaster, PostgresInit, psycopg_connect, requests_get
+from .test_etcd import etcd_read, etcd_write, socket_getaddrinfo
 
 SYSID = '12345678901'
 

tests/test_kubernetes.py

@@ -4,16 +4,19 @@ import json
 import socket
 import time
 import unittest
-import urllib3
+
+from threading import Thread
 from unittest import mock
-from unittest.mock import Mock, PropertyMock, mock_open, patch
+from unittest.mock import Mock, mock_open, patch, PropertyMock
+
+import urllib3
 
 from patroni.dcs import get_dcs
 from patroni.dcs.kubernetes import Cluster, k8s_client, k8s_config, K8sConfig, K8sConnectionFailed, \
-    K8sException, K8sObject, Kubernetes, KubernetesError, KubernetesRetriableException, \
-    Retry, RetryFailedError, SERVICE_HOST_ENV_NAME, SERVICE_PORT_ENV_NAME
+    K8sException, K8sObject, Kubernetes, KubernetesError, KubernetesRetriableException, Retry, \
+    RetryFailedError, SERVICE_HOST_ENV_NAME, SERVICE_PORT_ENV_NAME
 from patroni.postgresql.mpp import get_mpp
-from threading import Thread
+
 from . import MockResponse, SleepException
 
 

tests/test_log.py

@@ -2,11 +2,13 @@ import logging
 import os
 import sys
 import unittest
-import yaml
+
 from io import StringIO
-from queue import Queue, Full
+from queue import Full, Queue
 from unittest.mock import Mock, patch
 
+import yaml
+
 from patroni.config import Config
 from patroni.log import PatroniLogger
 

tests/test_mpp.py

@@ -1,4 +1,5 @@
 from typing import Any
+
 from patroni.exceptions import PatroniException
 from patroni.postgresql.mpp import AbstractMPP, get_mpp, Null
 

tests/test_patroni.py

@@ -1,13 +1,18 @@
-import etcd
 import logging
 import os
 import signal
 import time
 import unittest
-from unittest.mock import Mock, PropertyMock, patch
+
+from http.server import HTTPServer
+from threading import Thread
+from unittest.mock import Mock, patch, PropertyMock
+
+import etcd
 
 import patroni.config as config
-from http.server import HTTPServer
+
+from patroni.__main__ import check_psycopg, main as _main, Patroni
 from patroni.api import RestApiServer
 from patroni.async_executor import AsyncExecutor
 from patroni.dcs import Cluster, Member
@@ -15,8 +20,6 @@ from patroni.dcs.etcd import AbstractEtcdClientWithFailover
 from patroni.exceptions import DCSError
 from patroni.postgresql import Postgresql
 from patroni.postgresql.config import ConfigHandler
-from patroni.__main__ import check_psycopg, Patroni, main as _main
-from threading import Thread
 
 from . import psycopg_connect, SleepException
 from .test_etcd import etcd_read, etcd_write

tests/test_postgresql.py

@@ -1,13 +1,15 @@
 import datetime
 import os
-import psutil
 import re
 import subprocess
 import time
 
 from copy import deepcopy
 from pathlib import Path
-from unittest.mock import Mock, MagicMock, PropertyMock, patch, mock_open
+from threading import current_thread, Thread
+from unittest.mock import MagicMock, Mock, mock_open, patch, PropertyMock
+
+import psutil
 
 import patroni.psycopg as psycopg
 
@@ -15,22 +17,19 @@ from patroni import global_config
 from patroni.async_executor import CriticalTask
 from patroni.collections import CaseInsensitiveDict, CaseInsensitiveSet
 from patroni.dcs import RemoteMember
-from patroni.exceptions import PostgresConnectionException, PatroniException
-from patroni.postgresql import Postgresql, STATE_REJECT, STATE_NO_RESPONSE
+from patroni.exceptions import PatroniException, PostgresConnectionException
+from patroni.postgresql import Postgresql, STATE_NO_RESPONSE, STATE_REJECT
 from patroni.postgresql.bootstrap import Bootstrap
 from patroni.postgresql.callback_executor import CallbackAction
-from patroni.postgresql.config import get_param_diff, _false_validator
+from patroni.postgresql.config import _false_validator, get_param_diff
 from patroni.postgresql.postmaster import PostmasterProcess
-from patroni.postgresql.validator import (ValidatorFactoryNoType, ValidatorFactoryInvalidType,
-                                          ValidatorFactoryInvalidSpec, ValidatorFactory, InvalidGucValidatorsFile,
-                                          _get_postgres_guc_validators, _read_postgres_gucs_validators_file,
-                                          _load_postgres_gucs_validators, Bool, Integer, Real, Enum, EnumBool, String)
+from patroni.postgresql.validator import _get_postgres_guc_validators, _load_postgres_gucs_validators, \
+    _read_postgres_gucs_validators_file, Bool, Enum, EnumBool, Integer, InvalidGucValidatorsFile, Real, String, \
+    ValidatorFactory, ValidatorFactoryInvalidSpec, ValidatorFactoryInvalidType, ValidatorFactoryNoType
 from patroni.utils import RetryFailedError
-from threading import Thread, current_thread
-
-from . import (BaseTestPostgresql, MockCursor, MockPostmaster, psycopg_connect, mock_available_gucs,
-               GET_PG_SETTINGS_RESULT)
 
+from . import BaseTestPostgresql, GET_PG_SETTINGS_RESULT, \
+    mock_available_gucs, MockCursor, MockPostmaster, psycopg_connect
 
 mtime_ret = {}
 

tests/test_postmaster.py

@@ -1,7 +1,9 @@
 import multiprocessing
-import psutil
 import unittest
-from unittest.mock import Mock, patch, mock_open
+
+from unittest.mock import Mock, mock_open, patch
+
+import psutil
 
 from patroni.postgresql.postmaster import PostmasterProcess
 

tests/test_quorum.py

@@ -2,7 +2,7 @@ import unittest
 
 from typing import List, Set, Tuple
 
-from patroni.quorum import QuorumStateResolver, QuorumError
+from patroni.quorum import QuorumError, QuorumStateResolver
 
 
 class QuorumTest(unittest.TestCase):

tests/test_raft.py

@@ -1,14 +1,16 @@
 import os
-import unittest
 import tempfile
 import time
-from unittest.mock import Mock, PropertyMock, patch
+import unittest
+
+from unittest.mock import Mock, patch, PropertyMock
+
+from pysyncobj import FAIL_REASON, SyncObjConf
 
 from patroni.dcs import get_dcs
-from patroni.dcs.raft import Cluster, DynMemberSyncObj, KVStoreTTL, \
-    Raft, RaftError, SyncObjUtility, TCPTransport, _TCPTransport
+from patroni.dcs.raft import _TCPTransport, Cluster, DynMemberSyncObj, \
+    KVStoreTTL, Raft, RaftError, SyncObjUtility, TCPTransport
 from patroni.postgresql.mpp import get_mpp
-from pysyncobj import SyncObjConf, FAIL_REASON
 
 
 def remove_files(prefix):

tests/test_raft_controller.py

@@ -1,11 +1,13 @@
 import logging
 import os
 import unittest
+
 from unittest.mock import Mock, patch
 
 from pysyncobj import SyncObj
+
 from patroni.config import Config
-from patroni.raft_controller import RaftController, main as _main
+from patroni.raft_controller import main as _main, RaftController
 
 from . import SleepException
 from .test_raft import remove_files

tests/test_rewind.py

@@ -1,4 +1,4 @@
-from unittest.mock import Mock, PropertyMock, patch, mock_open
+from unittest.mock import Mock, mock_open, patch, PropertyMock
 
 from patroni.postgresql import Postgresql
 from patroni.postgresql.cancellable import CancellableSubprocess

tests/test_slots.py

@@ -1,8 +1,9 @@
 import os
 import unittest
+
 from threading import Thread
 from unittest import mock
-from unittest.mock import Mock, PropertyMock, patch
+from unittest.mock import Mock, patch, PropertyMock
 
 from patroni import global_config, psycopg
 from patroni.dcs import Cluster, ClusterConfig, Member, Status, SyncState
@@ -11,7 +12,7 @@ from patroni.postgresql.misc import fsync_dir
 from patroni.postgresql.slots import SlotsAdvanceThread, SlotsHandler
 from patroni.tags import Tags
 
-from . import BaseTestPostgresql, psycopg_connect, MockCursor
+from . import BaseTestPostgresql, MockCursor, psycopg_connect
 
 
 class TestTags(Tags):

tests/test_sync.py

@@ -7,7 +7,7 @@ from patroni.collections import CaseInsensitiveSet
 from patroni.dcs import Cluster, ClusterConfig, Status, SyncState
 from patroni.postgresql import Postgresql
 
-from . import BaseTestPostgresql, psycopg_connect, mock_available_gucs
+from . import BaseTestPostgresql, mock_available_gucs, psycopg_connect
 
 
 @patch('subprocess.call', Mock(return_value=0))

tests/test_utils.py

@@ -1,8 +1,9 @@
 import unittest
+
 from unittest.mock import Mock, patch
 
 from patroni.exceptions import PatroniException
-from patroni.utils import Retry, RetryFailedError, enable_keepalive, polling_loop, validate_directory, unquote
+from patroni.utils import enable_keepalive, polling_loop, Retry, RetryFailedError, unquote, validate_directory
 
 
 class TestUtils(unittest.TestCase):

tests/test_validator.py

@@ -5,9 +5,10 @@ import tempfile
 import unittest
 
 from io import StringIO
-from unittest.mock import Mock, patch, mock_open
+from unittest.mock import Mock, mock_open, patch
+
 from patroni.dcs import dcs_modules
-from patroni.validator import schema, Directory, Schema
+from patroni.validator import Directory, schema, Schema
 
 available_dcs = [m.split(".")[-1] for m in dcs_modules()]
 config = {

tests/test_wale_restore.py

@@ -1,11 +1,13 @@
 import subprocess
 import unittest
+
 from threading import current_thread
-from unittest.mock import Mock, PropertyMock, patch, mock_open
+from unittest.mock import Mock, mock_open, patch, PropertyMock
 
 import patroni.psycopg as psycopg
+
 from patroni.scripts import wale_restore
-from patroni.scripts.wale_restore import WALERestore, main as _main, get_major_version
+from patroni.scripts.wale_restore import get_major_version, main as _main, WALERestore
 
 from . import MockConnect, psycopg_connect
 

tests/test_watchdog.py

@@ -1,9 +1,11 @@
 import ctypes
-import patroni.watchdog.linux as linuxwd
+import os
 import sys
 import unittest
-import os
-from unittest.mock import patch, Mock, PropertyMock
+
+from unittest.mock import Mock, patch, PropertyMock
+
+import patroni.watchdog.linux as linuxwd
 
 from patroni.watchdog import Watchdog, WatchdogError
 from patroni.watchdog.base import NullWatchdog

tests/test_zookeeper.py

@@ -1,12 +1,14 @@
 import select
 import unittest
-from unittest.mock import Mock, PropertyMock, patch
+
+from unittest.mock import Mock, patch, PropertyMock
 
 from kazoo.client import KazooClient
-from kazoo.exceptions import NoNodeError, NodeExistsError
+from kazoo.exceptions import NodeExistsError, NoNodeError
 from kazoo.handlers.threading import SequentialThreadingHandler
 from kazoo.protocol.states import KeeperState, WatchedEvent, ZnodeStat
 from kazoo.retry import RetryFailedError
+
 from patroni.dcs import get_dcs
 from patroni.dcs.zookeeper import Cluster, PatroniKazooClient, \
     PatroniSequentialThreadingHandler, ZooKeeper, ZooKeeperError