pre-commit: add isort hook and apply (#354)

Author: abn

.pre-commit-config.yaml

@@ -2,6 +2,11 @@ ci:
   autofix_prs: false
 
 repos:
+  - repo: https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort
+
   - repo: https://github.com/psf/black
     rev: 22.1.0
     hooks:

benchmarks/benchmarks.py

@@ -1,8 +1,8 @@
-import betterproto
 from dataclasses import dataclass
-
 from typing import List
 
+import betterproto
+
 
 @dataclass
 class TestMessage(betterproto.Message):

pyproject.toml

@@ -100,6 +100,15 @@ help = "Run tests with multiple pythons"
 cmd = "black . --check --diff"
 help = "Check if code style is correct"
 
+[tool.isort]
+py_version = 37
+profile = "black"
+force_single_line = false
+combine_as_imports = true
+lines_after_imports = 2
+include_trailing_comma = true
+force_grid_wrap = 2
+src_paths = ["src", "tests"]
 
 [tool.black]
 target-version = ['py36']

src/betterproto/__init__.py

@@ -7,9 +7,16 @@
 import typing
 import warnings
 from abc import ABC
-from base64 import b64decode, b64encode
+from base64 import (
+    b64decode,
+    b64encode,
+)
 from copy import deepcopy
-from datetime import datetime, timedelta, timezone
+from datetime import (
+    datetime,
+    timedelta,
+    timezone,
+)
 from typing import (
     Any,
     Callable,
@@ -29,9 +36,14 @@
 
 from ._types import T
 from ._version import __version__
-from .casing import camel_case, safe_snake_case, snake_case
+from .casing import (
+    camel_case,
+    safe_snake_case,
+    snake_case,
+)
 from .grpc.grpclib_client import ServiceStub
 
+
 # Proto 3 data types
 TYPE_ENUM = "enum"
 TYPE_BOOL = "bool"

src/betterproto/_types.py

@@ -1,7 +1,12 @@
-from typing import TYPE_CHECKING, TypeVar
+from typing import (
+    TYPE_CHECKING,
+    TypeVar,
+)
+
 
 if TYPE_CHECKING:
     from grpclib._typing import IProtoMessage
+
     from . import Message
 
 # Bound type variable to allow methods to return `self` of subclasses

src/betterproto/_version.py

@@ -1,3 +1,4 @@
 from pkg_resources import get_distribution
 
+
 __version__ = get_distribution("betterproto").version

src/betterproto/casing.py

@@ -1,6 +1,7 @@
 import keyword
 import re
 
+
 # Word delimiters and symbols that will not be preserved when re-casing.
 # language=PythonRegExp
 SYMBOLS = "[^a-zA-Z0-9]*"

src/betterproto/compile/importing.py

@@ -1,11 +1,18 @@
 import os
 import re
-from typing import Dict, List, Set, Tuple, Type
+from typing import (
+    Dict,
+    List,
+    Set,
+    Tuple,
+    Type,
+)
 
 from ..casing import safe_snake_case
 from ..lib.google import protobuf as google_protobuf
 from .naming import pythonize_class_name
 
+
 WRAPPER_TYPES: Dict[str, Type] = {
     ".google.protobuf.DoubleValue": google_protobuf.DoubleValue,
     ".google.protobuf.FloatValue": google_protobuf.FloatValue,

src/betterproto/grpc/grpclib_client.py

@@ -15,7 +15,11 @@
 
 import grpclib.const
 
-from .._types import ST, T
+from .._types import (
+    ST,
+    T,
+)
+
 
 if TYPE_CHECKING:
     from grpclib.client import Channel

src/betterproto/grpc/grpclib_server.py

@@ -1,6 +1,10 @@
 from abc import ABC
 from collections.abc import AsyncIterable
-from typing import Any, Callable, Dict
+from typing import (
+    Any,
+    Callable,
+    Dict,
+)
 
 import grpclib
 import grpclib.server