Replace "isort" with "reorder-python-imports"

.pre-commit-config.yaml

@@ -11,12 +11,12 @@ repos:
       - id: "mypy"
         name: "Python: types"
 
-  - repo: "https://github.com/PyCQA/isort"
-    rev: "5.13.2"
+  - repo: "https://github.com/asottile/reorder-python-imports"
+    rev: "v3.14.0"
     hooks:
-      - id: "isort"
+      - id: "reorder-python-imports"
         name: "Python: imports"
-        args: ["--profile", "black"]
+        args: ["--py39-plus"]
 
   - repo: "https://github.com/pre-commit/pre-commit-hooks"
     rev: "v5.0.0"

setup.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -11,12 +10,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import os
 from codecs import open
-from typing import Any, Dict
+from typing import Any
+from typing import Dict
 
-from setuptools import find_packages, setup
+from setuptools import find_packages
+from setuptools import setup
 
 about: Dict[str, Any] = {}
 here = os.path.abspath(os.path.dirname(__file__))

tests/integration/conftest.py

@@ -9,7 +9,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import os
 import socket
 import subprocess
@@ -20,7 +19,9 @@
 import pytest
 
 import trino.logging
-from trino.client import ClientSession, TrinoQuery, TrinoRequest
+from trino.client import ClientSession
+from trino.client import TrinoQuery
+from trino.client import TrinoRequest
 from trino.constants import DEFAULT_PORT
 
 logger = trino.logging.get_logger(__name__)

tests/integration/test_dbapi_integration.py

@@ -12,7 +12,11 @@
 import math
 import time as t
 import uuid
-from datetime import date, datetime, time, timedelta, timezone
+from datetime import date
+from datetime import datetime
+from datetime import time
+from datetime import timedelta
+from datetime import timezone
 from decimal import Decimal
 from typing import Tuple
 from zoneinfo import ZoneInfo
@@ -24,8 +28,12 @@
 import trino
 from tests.integration.conftest import trino_version
 from trino import constants
-from trino.dbapi import Cursor, DescribeOutput, TimeBoundLRUCache
-from trino.exceptions import NotSupportedError, TrinoQueryError, TrinoUserError
+from trino.dbapi import Cursor
+from trino.dbapi import DescribeOutput
+from trino.dbapi import TimeBoundLRUCache
+from trino.exceptions import NotSupportedError
+from trino.exceptions import TrinoQueryError
+from trino.exceptions import TrinoUserError
 from trino.transaction import IsolationLevel
 
 

tests/integration/test_sqlalchemy_integration.py

@@ -15,12 +15,16 @@
 
 import pytest
 import sqlalchemy as sqla
-from sqlalchemy.sql import and_, not_, or_
+from sqlalchemy.sql import and_
+from sqlalchemy.sql import not_
+from sqlalchemy.sql import or_
 from sqlalchemy.types import ARRAY
 
 from tests.integration.conftest import trino_version
 from tests.unit.conftest import sqlalchemy_version
-from trino.sqlalchemy.datatype import JSON, MAP, ROW
+from trino.sqlalchemy.datatype import JSON
+from trino.sqlalchemy.datatype import MAP
+from trino.sqlalchemy.datatype import ROW
 
 
 @pytest.fixture

tests/integration/test_types_integration.py

@@ -1,7 +1,12 @@
 import math
 import re
 import uuid
-from datetime import date, datetime, time, timedelta, timezone, tzinfo
+from datetime import date
+from datetime import datetime
+from datetime import time
+from datetime import timedelta
+from datetime import timezone
+from datetime import tzinfo
 from decimal import Decimal
 from zoneinfo import ZoneInfo
 

tests/unit/conftest.py

@@ -9,8 +9,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock
+from unittest.mock import patch
 
 import pytest
 

tests/unit/oauth_test_utils.py

@@ -9,7 +9,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import json
 import re
 import uuid

tests/unit/sqlalchemy/conftest.py

@@ -12,7 +12,11 @@
 import pytest
 from sqlalchemy.sql.sqltypes import ARRAY
 
-from trino.sqlalchemy.datatype import MAP, ROW, TIME, TIMESTAMP, SQLType
+from trino.sqlalchemy.datatype import MAP
+from trino.sqlalchemy.datatype import ROW
+from trino.sqlalchemy.datatype import SQLType
+from trino.sqlalchemy.datatype import TIME
+from trino.sqlalchemy.datatype import TIMESTAMP
 
 
 @pytest.fixture(scope="session")

tests/unit/sqlalchemy/test_compiler.py

@@ -10,9 +10,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import pytest
-from sqlalchemy import Column, Integer, MetaData, String, Table, func, insert, select
+from sqlalchemy import Column
+from sqlalchemy import func
+from sqlalchemy import insert
+from sqlalchemy import Integer
+from sqlalchemy import MetaData
+from sqlalchemy import select
+from sqlalchemy import String
+from sqlalchemy import Table
 from sqlalchemy.schema import CreateTable
-from sqlalchemy.sql import column, table
+from sqlalchemy.sql import column
+from sqlalchemy.sql import table
 
 from tests.unit.conftest import sqlalchemy_version
 from trino.sqlalchemy.dialect import TrinoDialect

tests/unit/sqlalchemy/test_datatype_parse.py

@@ -11,11 +11,19 @@
 # limitations under the License.
 import pytest
 from sqlalchemy.exc import UnsupportedCompilationError
-from sqlalchemy.sql.sqltypes import ARRAY, CHAR, DATE, DECIMAL, INTEGER, VARCHAR
+from sqlalchemy.sql.sqltypes import ARRAY
+from sqlalchemy.sql.sqltypes import CHAR
+from sqlalchemy.sql.sqltypes import DATE
+from sqlalchemy.sql.sqltypes import DECIMAL
+from sqlalchemy.sql.sqltypes import INTEGER
+from sqlalchemy.sql.sqltypes import VARCHAR
 from sqlalchemy.sql.type_api import TypeEngine
 
 from trino.sqlalchemy import datatype
-from trino.sqlalchemy.datatype import MAP, ROW, TIME, TIMESTAMP
+from trino.sqlalchemy.datatype import MAP
+from trino.sqlalchemy.datatype import ROW
+from trino.sqlalchemy.datatype import TIME
+from trino.sqlalchemy.datatype import TIMESTAMP
 
 
 @pytest.mark.parametrize(

tests/unit/sqlalchemy/test_dialect.py

@@ -1,17 +1,19 @@
-from typing import Any, Dict, List
+from typing import Any
+from typing import Dict
+from typing import List
 from unittest import mock
 
 import pytest
-from sqlalchemy.engine.url import URL, make_url
+from sqlalchemy.engine.url import make_url
+from sqlalchemy.engine.url import URL
 
-from trino.auth import BasicAuthentication, OAuth2Authentication
+from trino.auth import BasicAuthentication
+from trino.auth import OAuth2Authentication
 from trino.dbapi import Connection
 from trino.sqlalchemy import URL as trino_url
-from trino.sqlalchemy.dialect import (
-    CertificateAuthentication,
-    JWTAuthentication,
-    TrinoDialect,
-)
+from trino.sqlalchemy.dialect import CertificateAuthentication
+from trino.sqlalchemy.dialect import JWTAuthentication
+from trino.sqlalchemy.dialect import TrinoDialect
 from trino.transaction import IsolationLevel
 
 

tests/unit/test_client.py

@@ -15,8 +15,11 @@
 import urllib
 import uuid
 from contextlib import nullcontext as does_not_raise
-from typing import Any, Dict, Optional
-from unittest import TestCase, mock
+from typing import Any
+from typing import Dict
+from typing import Optional
+from unittest import mock
+from unittest import TestCase
 from urllib.parse import urlparse
 from zoneinfo import ZoneInfoNotFoundError
 
@@ -31,34 +34,29 @@
 from tzlocal import get_localzone_name  # type: ignore
 
 import trino.exceptions
-from tests.unit.oauth_test_utils import (
-    REDIRECT_RESOURCE,
-    SERVER_ADDRESS,
-    TOKEN_RESOURCE,
-    GetTokenCallback,
-    MultithreadedTokenServer,
-    PostStatementCallback,
-    RedirectHandler,
-    RedirectHandlerWithException,
-    _get_token_requests,
-    _post_statement_requests,
-)
-from trino import __version__, constants
-from trino.auth import (
-    GSSAPIAuthentication,
-    KerberosAuthentication,
-    _OAuth2KeyRingTokenCache,
-    _OAuth2TokenBearer,
-)
-from trino.client import (
-    ClientSession,
-    TrinoQuery,
-    TrinoRequest,
-    TrinoResult,
-    _DelayExponential,
-    _retry_with,
-    _RetryWithExponentialBackoff,
-)
+from tests.unit.oauth_test_utils import _get_token_requests
+from tests.unit.oauth_test_utils import _post_statement_requests
+from tests.unit.oauth_test_utils import GetTokenCallback
+from tests.unit.oauth_test_utils import MultithreadedTokenServer
+from tests.unit.oauth_test_utils import PostStatementCallback
+from tests.unit.oauth_test_utils import REDIRECT_RESOURCE
+from tests.unit.oauth_test_utils import RedirectHandler
+from tests.unit.oauth_test_utils import RedirectHandlerWithException
+from tests.unit.oauth_test_utils import SERVER_ADDRESS
+from tests.unit.oauth_test_utils import TOKEN_RESOURCE
+from trino import __version__
+from trino import constants
+from trino.auth import _OAuth2KeyRingTokenCache
+from trino.auth import _OAuth2TokenBearer
+from trino.auth import GSSAPIAuthentication
+from trino.auth import KerberosAuthentication
+from trino.client import _DelayExponential
+from trino.client import _retry_with
+from trino.client import _RetryWithExponentialBackoff
+from trino.client import ClientSession
+from trino.client import TrinoQuery
+from trino.client import TrinoRequest
+from trino.client import TrinoResult
 
 
 @mock.patch("trino.client.TrinoRequest.http")

tests/unit/test_dbapi.py

@@ -17,19 +17,18 @@
 from httpretty import httprettified
 from requests import Session
 
-from tests.unit.oauth_test_utils import (
-    REDIRECT_RESOURCE,
-    SERVER_ADDRESS,
-    TOKEN_RESOURCE,
-    GetTokenCallback,
-    PostStatementCallback,
-    RedirectHandler,
-    _get_token_requests,
-    _post_statement_requests,
-)
+from tests.unit.oauth_test_utils import _get_token_requests
+from tests.unit.oauth_test_utils import _post_statement_requests
+from tests.unit.oauth_test_utils import GetTokenCallback
+from tests.unit.oauth_test_utils import PostStatementCallback
+from tests.unit.oauth_test_utils import REDIRECT_RESOURCE
+from tests.unit.oauth_test_utils import RedirectHandler
+from tests.unit.oauth_test_utils import SERVER_ADDRESS
+from tests.unit.oauth_test_utils import TOKEN_RESOURCE
 from trino import constants
 from trino.auth import OAuth2Authentication
-from trino.dbapi import Connection, connect
+from trino.dbapi import connect
+from trino.dbapi import Connection
 
 
 @patch("trino.dbapi.trino.client")

tests/unit/test_http.py

@@ -9,14 +9,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 from trino import constants
-from trino.client import (
-    get_header_values,
-    get_prepared_statement_values,
-    get_roles_values,
-    get_session_property_values,
-)
+from trino.client import get_header_values
+from trino.client import get_prepared_statement_values
+from trino.client import get_roles_values
+from trino.client import get_session_property_values
 
 
 def test_get_header_values():

tests/unit/test_transaction.py

@@ -9,7 +9,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import pytest
 
 from trino.transaction import IsolationLevel

tests/unit/test_types.py

@@ -9,9 +9,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import pickle
-from datetime import datetime, time
+from datetime import datetime
+from datetime import time
 from decimal import Decimal
 
 import pytest

trino/__init__.py

@@ -9,17 +9,19 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-from . import auth, client, constants, dbapi, exceptions, logging
-from ._version import (
-    __author__,
-    __author_email__,
-    __description__,
-    __license__,
-    __title__,
-    __url__,
-    __version__,
-)
+from . import auth
+from . import client
+from . import constants
+from . import dbapi
+from . import exceptions
+from . import logging
+from ._version import __author__
+from ._version import __author_email__
+from ._version import __description__
+from ._version import __license__
+from ._version import __title__
+from ._version import __url__
+from ._version import __version__
 
 __all__ = [
     "auth",