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

Author: arturdryomov

.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